Move caches endpoint auto-configuration into spring-boot-cache

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/CachesEndpointAutoConfiguration.java

@@ -0,0 +1,61 @@
+/*
+ * 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.cache.actuate.endpoint.autoconfigure;
+
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.SimpleAutowireCandidateResolver;
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.EndpointExposure;
+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.ConditionalOnMissingBean;
+import org.springframework.boot.cache.actuate.endpoint.CachesEndpoint;
+import org.springframework.boot.cache.actuate.endpoint.CachesEndpointWebExtension;
+import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
+import org.springframework.cache.CacheManager;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for {@link CachesEndpoint}.
+ *
+ * @author Johannes Edmeier
+ * @author Stephane Nicoll
+ * @since 4.0.0
+ */
+@AutoConfiguration(after = CacheAutoConfiguration.class)
+@ConditionalOnClass({ CacheManager.class, ConditionalOnAvailableEndpoint.class })
+@ConditionalOnAvailableEndpoint(CachesEndpoint.class)
+public class CachesEndpointAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public CachesEndpoint cachesEndpoint(ConfigurableListableBeanFactory beanFactory) {
+		return new CachesEndpoint(
+				SimpleAutowireCandidateResolver.resolveAutowireCandidates(beanFactory, CacheManager.class));
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnBean(CachesEndpoint.class)
+	@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
+	public CachesEndpointWebExtension cachesEndpointWebExtension(CachesEndpoint cachesEndpoint) {
+		return new CachesEndpointWebExtension(cachesEndpoint);
+	}
+
+}

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/package-info.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 actuator cache concerns.
+ */
+package org.springframework.boot.cache.actuate.endpoint.autoconfigure;

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

@@ -1 +1,2 @@
+org.springframework.boot.cache.actuate.endpoint.autoconfigure.CachesEndpointAutoConfiguration
 org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/CachesEndpointAutoConfigurationTests.java

@@ -0,0 +1,77 @@
+/*
+ * 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.cache.actuate.endpoint.autoconfigure;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.cache.actuate.endpoint.CachesEndpoint;
+import org.springframework.boot.cache.actuate.endpoint.CachesEndpointWebExtension;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cache.CacheManager;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link CachesEndpointAutoConfiguration}.
+ *
+ * @author Johannes Edmeier
+ * @author Stephane Nicoll
+ */
+class CachesEndpointAutoConfigurationTests {
+
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+		.withConfiguration(AutoConfigurations.of(CachesEndpointAutoConfiguration.class));
+
+	@Test
+	void runShouldHaveEndpointBean() {
+		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
+			.withPropertyValues("management.endpoints.web.exposure.include=caches")
+			.run((context) -> assertThat(context).hasSingleBean(CachesEndpoint.class));
+	}
+
+	@Test
+	void runWithoutCacheManagerShouldHaveEndpointBean() {
+		this.contextRunner.withPropertyValues("management.endpoints.web.exposure.include=caches")
+			.run((context) -> assertThat(context).hasSingleBean(CachesEndpoint.class));
+	}
+
+	@Test
+	void runWhenNotExposedShouldNotHaveEndpointBean() {
+		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(CachesEndpoint.class));
+	}
+
+	@Test
+	void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
+		this.contextRunner.withPropertyValues("management.endpoint.caches.enabled:false")
+			.withPropertyValues("management.endpoints.web.exposure.include=*")
+			.withBean(CacheManager.class, () -> mock(CacheManager.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(CachesEndpoint.class));
+	}
+
+	@Test
+	void runWhenOnlyExposedOverJmxShouldHaveEndpointBeanWithoutWebExtension() {
+		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
+			.withPropertyValues("management.endpoints.web.exposure.include=info", "spring.jmx.enabled=true",
+					"management.endpoints.jmx.exposure.include=caches")
+			.run((context) -> assertThat(context).hasSingleBean(CachesEndpoint.class)
+				.doesNotHaveBean(CachesEndpointWebExtension.class));
+	}
+
+}