From 00bbc3ca199c0e885e29b9e554500c0139105809 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 25 Mar 2024 22:17:53 +0100 Subject: [PATCH] refactor: Moved the ``StorageStrategyIT`` into package ``storage`` -- ALIGN --- .../backend/storage/AbstractInMemoryStorageStrategyIT.java | 4 ++-- .../chat/backend/storage/AbstractStorageStrategyIT.java | 3 ++- .../storage/InMemoryWithFilesStorageStrategyIT.java | 7 ++++--- .../storage/InMemoryWithMongoDbStorageStrategyIT.java | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractInMemoryStorageStrategyIT.java b/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractInMemoryStorageStrategyIT.java index 843b9490..52189f85 100644 --- a/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractInMemoryStorageStrategyIT.java +++ b/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractInMemoryStorageStrategyIT.java @@ -1,4 +1,4 @@ -package de.juplo.kafka.chat.backend; +package de.juplo.kafka.chat.backend.storage; import de.juplo.kafka.chat.backend.implementation.inmemory.InMemoryTestUtils; import de.juplo.kafka.chat.backend.implementation.inmemory.SimpleChatHomeService; @@ -9,7 +9,7 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration(classes = InMemoryTestUtils.class) @Slf4j -public abstract class AbstractInMemoryStorageIT extends AbstractStorageStrategyIT +public abstract class AbstractInMemoryStorageStrategyIT extends AbstractStorageStrategyIT { @Autowired InMemoryTestUtils testUtils; diff --git a/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractStorageStrategyIT.java b/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractStorageStrategyIT.java index 74c7c6fd..9418ef39 100644 --- a/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractStorageStrategyIT.java +++ b/src/test/java/de/juplo/kafka/chat/backend/storage/AbstractStorageStrategyIT.java @@ -1,5 +1,6 @@ -package de.juplo.kafka.chat.backend; +package de.juplo.kafka.chat.backend.storage; +import de.juplo.kafka.chat.backend.ChatBackendProperties; import de.juplo.kafka.chat.backend.domain.*; import de.juplo.kafka.chat.backend.implementation.StorageStrategy; import de.juplo.kafka.chat.backend.implementation.inmemory.InMemoryServicesConfiguration; diff --git a/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithFilesStorageStrategyIT.java b/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithFilesStorageStrategyIT.java index 0d63b7ed..1b4c9355 100644 --- a/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithFilesStorageStrategyIT.java +++ b/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithFilesStorageStrategyIT.java @@ -1,8 +1,9 @@ -package de.juplo.kafka.chat.backend; +package de.juplo.kafka.chat.backend.storage; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import de.juplo.kafka.chat.backend.ChatBackendProperties; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +21,9 @@ import java.nio.file.Paths; "chat.backend.inmemory.sharding-strategy=none", "chat.backend.inmemory.storage-strategy=files", "chat.backend.inmemory.storage-directory=target/files" }) -@ContextConfiguration(classes = InMemoryWithFilesStorageIT.TestConfig.class) +@ContextConfiguration(classes = InMemoryWithFilesStorageStrategyIT.TestConfig.class) @Slf4j -public class InMemoryWithFilesStorageIT extends AbstractInMemoryStorageIT +public class InMemoryWithFilesStorageStrategyIT extends AbstractInMemoryStorageStrategyIT { @BeforeEach void resetStorage( diff --git a/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithMongoDbStorageStrategyIT.java b/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithMongoDbStorageStrategyIT.java index 464513bd..ff3a7a13 100644 --- a/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithMongoDbStorageStrategyIT.java +++ b/src/test/java/de/juplo/kafka/chat/backend/storage/InMemoryWithMongoDbStorageStrategyIT.java @@ -1,4 +1,4 @@ -package de.juplo.kafka.chat.backend; +package de.juplo.kafka.chat.backend.storage; import de.juplo.kafka.chat.backend.storage.mongodb.ChatRoomRepository; import de.juplo.kafka.chat.backend.storage.mongodb.MessageRepository; @@ -21,7 +21,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; @Testcontainers @EnableAutoConfiguration @Slf4j -public class InMemoryWithMongoDbStorageIT extends AbstractInMemoryStorageIT +public class InMemoryWithMongoDbStorageStrategyIT extends AbstractInMemoryStorageStrategyIT { @Container @ServiceConnection -- 2.39.5