diff --git a/app/server/reactive-caching/src/main/resources/META-INF/spring.factories b/app/server/reactive-caching/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c1b04ae09f..0000000000 --- a/app/server/reactive-caching/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.appsmith.caching.CachingConfig \ No newline at end of file diff --git a/app/server/reactive-caching/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/app/server/reactive-caching/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000..81f445488b --- /dev/null +++ b/app/server/reactive-caching/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.appsmith.caching.CachingConfig \ No newline at end of file diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/CacheApplication.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/CacheApplication.java similarity index 89% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/CacheApplication.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/CacheApplication.java index ffeb04006d..e8c791bcd3 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/CacheApplication.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/CacheApplication.java @@ -1,4 +1,4 @@ -package com.appsmith.caching; +package com.appsmith.testcaching; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/configuration/RedisTestContainerConfig.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/configuration/RedisTestContainerConfig.java similarity index 98% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/configuration/RedisTestContainerConfig.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/configuration/RedisTestContainerConfig.java index 4e0fc637cf..106a06b065 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/configuration/RedisTestContainerConfig.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/configuration/RedisTestContainerConfig.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.configuration; +package com.appsmith.testcaching.configuration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/ArgumentModel.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/ArgumentModel.java similarity index 79% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/model/ArgumentModel.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/ArgumentModel.java index 0d7255696f..80ef484ed6 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/ArgumentModel.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/ArgumentModel.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.model; +package com.appsmith.testcaching.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/NestedModel.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/NestedModel.java similarity index 77% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/model/NestedModel.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/NestedModel.java index 3795e2bd87..092dd73eb7 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/NestedModel.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/NestedModel.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.model; +package com.appsmith.testcaching.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/ParentModel.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/ParentModel.java similarity index 77% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/model/ParentModel.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/ParentModel.java index 946cb1f2b2..95130a68f3 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/ParentModel.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/ParentModel.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.model; +package com.appsmith.testcaching.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/TestModel.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/TestModel.java similarity index 91% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/model/TestModel.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/TestModel.java index d6b4a6da23..e50c5b29c2 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/model/TestModel.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/model/TestModel.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.model; +package com.appsmith.testcaching.model; import java.time.Instant; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/service/CacheTestService.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/service/CacheTestService.java similarity index 96% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/service/CacheTestService.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/service/CacheTestService.java index a5a98995db..ed8b2288f6 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/service/CacheTestService.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/service/CacheTestService.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.service; +package com.appsmith.testcaching.service; import java.time.Duration; import java.util.ArrayList; @@ -7,9 +7,9 @@ import java.util.List; import org.springframework.stereotype.Service; import com.appsmith.caching.annotations.CacheEvict; +import com.appsmith.testcaching.model.ArgumentModel; +import com.appsmith.testcaching.model.TestModel; import com.appsmith.caching.annotations.Cache; -import com.appsmith.caching.model.ArgumentModel; -import com.appsmith.caching.model.TestModel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/app/server/reactive-caching/src/test/java/com/appsmith/caching/test/TestCachingMethods.java b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/test/TestCachingMethods.java similarity index 95% rename from app/server/reactive-caching/src/test/java/com/appsmith/caching/test/TestCachingMethods.java rename to app/server/reactive-caching/src/test/java/com/appsmith/testcaching/test/TestCachingMethods.java index 9684691910..85f787fd51 100644 --- a/app/server/reactive-caching/src/test/java/com/appsmith/caching/test/TestCachingMethods.java +++ b/app/server/reactive-caching/src/test/java/com/appsmith/testcaching/test/TestCachingMethods.java @@ -1,4 +1,4 @@ -package com.appsmith.caching.test; +package com.appsmith.testcaching.test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import com.appsmith.caching.components.CacheManager; -import com.appsmith.caching.model.ArgumentModel; -import com.appsmith.caching.model.TestModel; -import com.appsmith.caching.service.CacheTestService; +import com.appsmith.testcaching.model.ArgumentModel; +import com.appsmith.testcaching.model.TestModel; +import com.appsmith.testcaching.service.CacheTestService; import lombok.extern.slf4j.Slf4j;