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

Author: wilkinsona

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

@@ -3,7 +3,6 @@ org.springframework.boot.actuate.autoconfigure.audit.AuditEventsEndpointAutoConf
 org.springframework.boot.actuate.autoconfigure.availability.AvailabilityHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.availability.AvailabilityProbesAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.cache.CachesEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.cloudfoundry.reactive.ReactiveCloudFoundryActuatorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundryActuatorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration

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

@@ -22,7 +22,7 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers")
 
-	optional(project(":spring-boot-project:spring-boot-actuator"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-data-couchbase"))
 	optional(project(":spring-boot-project:spring-boot-data-redis"))
@@ -38,7 +38,6 @@ dependencies {
 			classifier = 'jakarta'
 		}
 	}
-
 	optional("org.hibernate.orm:hibernate-core")
 	optional("org.hibernate.orm:hibernate-jcache")
 	optional("org.infinispan:infinispan-commons")

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.cache;
+package org.springframework.boot.cache.actuate.endpoint.autoconfigure;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.SimpleAutowireCandidateResolver;
@@ -27,6 +27,7 @@
 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;
 
@@ -35,10 +36,10 @@
  *
  * @author Johannes Edmeier
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
-@AutoConfiguration(afterName = "org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration")
-@ConditionalOnClass({ CacheManager.class, CachesEndpoint.class })
+@AutoConfiguration(after = CacheAutoConfiguration.class)
+@ConditionalOnClass({ CacheManager.class, ConditionalOnAvailableEndpoint.class })
 @ConditionalOnAvailableEndpoint(CachesEndpoint.class)
 public class CachesEndpointAutoConfiguration {
 

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

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for actuator cache concerns.
  */
-package org.springframework.boot.actuate.autoconfigure.cache;
+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-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/CachesEndpointAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.cache;
+package org.springframework.boot.cache.actuate.endpoint.autoconfigure;
 
 import org.junit.jupiter.api.Test;