Move mapping description auto-configuration into appropriate modules

Author: wilkinsona

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

@@ -14,4 +14,3 @@ org.springframework.boot.actuate.autoconfigure.tracing.prometheus.PrometheusExem
 org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinTracingAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration

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

@@ -0,0 +1,44 @@
+/*
+ * 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.autoconfigure.web.mappings;
+
+import org.springframework.beans.factory.ObjectProvider;
+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.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for {@link MappingsEndpoint}.
+ *
+ * @author Andy Wilkinson
+ * @since 2.0.0
+ */
+@AutoConfiguration
+@ConditionalOnAvailableEndpoint(MappingsEndpoint.class)
+public class MappingsEndpointAutoConfiguration {
+
+	@Bean
+	MappingsEndpoint mappingsEndpoint(ApplicationContext applicationContext,
+			ObjectProvider<MappingDescriptionProvider> descriptionProviders) {
+		return new MappingsEndpoint(descriptionProviders.orderedStream().toList(), applicationContext);
+	}
+
+}

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

@@ -23,4 +23,5 @@ org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguratio
 org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.startup.StartupEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration

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

@@ -0,0 +1,49 @@
+/*
+ * 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.autoconfigure.web.mappings;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link MappingsEndpointAutoConfiguration}.
+ *
+ * @author Andy Wilkinson
+ */
+class MappingsEndpointAutoConfigurationTests {
+
+	@Test
+	void whenEndpointIsUnavailableThenEndpointIsNotCreated() {
+		new WebApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(MappingsEndpointAutoConfiguration.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(MappingsEndpoint.class));
+	}
+
+	@Test
+	void whenEndpointIsAvailableThenEndpointIsCreated() {
+		new WebApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(MappingsEndpointAutoConfiguration.class))
+			.withPropertyValues("management.endpoints.web.exposure.include=mappings")
+			.run((context) -> assertThat(context).hasSingleBean(MappingsEndpoint.class));
+	}
+
+}

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/package-info.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/package-info.java

@@ -18,6 +18,7 @@ dependencies {
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("org.springframework.security:spring-security-config")
 
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")

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

@@ -0,0 +1,54 @@
+/*
+ * 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.servlet.actuate.autoconfigure.mappings;
+
+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.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+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.servlet.actuate.mappings.FiltersMappingDescriptionProvider;
+import org.springframework.boot.servlet.actuate.mappings.ServletsMappingDescriptionProvider;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} to describe Servlet-related
+ * {@link MappingDescriptionProvider mappings}.
+ *
+ * @author Andy Wilkinson
+ * @since 4.0.0
+ */
+@AutoConfiguration
+@ConditionalOnClass({ ConditionalOnAvailableEndpoint.class, MappingsEndpoint.class })
+@ConditionalOnAvailableEndpoint(MappingsEndpoint.class)
+@ConditionalOnWebApplication(type = Type.SERVLET)
+public class ServletMappingsAutoConfiguration {
+
+	@Bean
+	ServletsMappingDescriptionProvider servletMappingDescriptionProvider() {
+		return new ServletsMappingDescriptionProvider();
+	}
+
+	@Bean
+	FiltersMappingDescriptionProvider filterMappingDescriptionProvider() {
+		return new FiltersMappingDescriptionProvider();
+	}
+
+}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfigurationTests.java

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+/**
+ * Auto-configuration for Servlet-based integration with Actuator's mappings support.
+ */
+package org.springframework.boot.servlet.actuate.autoconfigure.mappings;

spring-boot-project/spring-boot-servlet/build.gradle

@@ -1,2 +1,3 @@
 org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration
+org.springframework.boot.servlet.actuate.autoconfigure.mappings.ServletMappingsAutoConfiguration
 org.springframework.boot.servlet.autoconfigure.MultipartAutoConfiguration