diff --git a/src/main/java/org/fireflyframework/cache/annotation/EnableCaching.java b/src/main/java/org/fireflyframework/cache/annotation/EnableCaching.java index fc74fb5..c6c8dc1 100644 --- a/src/main/java/org/fireflyframework/cache/annotation/EnableCaching.java +++ b/src/main/java/org/fireflyframework/cache/annotation/EnableCaching.java @@ -16,9 +16,6 @@ package org.fireflyframework.cache.annotation; -import org.fireflyframework.cache.config.CacheAutoConfiguration; -import org.springframework.context.annotation.Import; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -31,6 +28,10 @@ * support for Firefly cache annotations like {@link Cacheable}, {@link CacheEvict}, * and {@link CachePut}. *

+ * Note: The actual auto-configuration is registered via + * {@code META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports}. + * This annotation serves as a marker only. + *

* Example usage: *

  * @Configuration
@@ -42,7 +43,6 @@
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@Import(CacheAutoConfiguration.class)
 public @interface EnableCaching {
 
     /**
diff --git a/src/main/java/org/fireflyframework/cache/config/CacheAutoConfiguration.java b/src/main/java/org/fireflyframework/cache/config/CacheAutoConfiguration.java
index 13d9e97..c08b0ce 100644
--- a/src/main/java/org/fireflyframework/cache/config/CacheAutoConfiguration.java
+++ b/src/main/java/org/fireflyframework/cache/config/CacheAutoConfiguration.java
@@ -33,7 +33,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
 
@@ -61,7 +60,6 @@
 @AutoConfiguration
 @ConditionalOnProperty(prefix = "firefly.cache", name = "enabled", havingValue = "true", matchIfMissing = true)
 @EnableConfigurationProperties(CacheProperties.class)
-@ComponentScan(basePackages = "org.fireflyframework.cache")
 @EnableAsync
 @Slf4j
 public class CacheAutoConfiguration {
diff --git a/src/test/java/org/fireflyframework/cache/config/CacheAutoConfigurationRedisIntegrationTest.java b/src/test/java/org/fireflyframework/cache/config/CacheAutoConfigurationRedisIntegrationTest.java
index 4b50884..e6e10fc 100644
--- a/src/test/java/org/fireflyframework/cache/config/CacheAutoConfigurationRedisIntegrationTest.java
+++ b/src/test/java/org/fireflyframework/cache/config/CacheAutoConfigurationRedisIntegrationTest.java
@@ -43,7 +43,7 @@ class CacheAutoConfigurationRedisIntegrationTest {
             .withReuse(true);
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-            .withConfiguration(AutoConfigurations.of(CacheAutoConfiguration.class));
+            .withConfiguration(AutoConfigurations.of(CacheAutoConfiguration.class, RedisCacheAutoConfiguration.class));
 
     @Test
     void shouldCreateRedisBeansWhenRedisIsConfigured() {