refactor: Refined (simplified) `StorageStrategy`

[demos/kafka/chat] / src / main / java / de / juplo / kafka / chat / backend / ChatBackendConfiguration.java

diff --git a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
index b590854..87965ab 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
@@ -2,10 +2,11 @@ package de.juplo.kafka.chat.backend;
 
 import de.juplo.kafka.chat.backend.domain.ChatHome;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.juplo.kafka.chat.backend.domain.ChatroomFactory;
-import de.juplo.kafka.chat.backend.persistence.InMemoryChatroomFactory;
-import de.juplo.kafka.chat.backend.persistence.LocalJsonFilesStorageStrategy;
+import de.juplo.kafka.chat.backend.domain.ChatHomeService;
+import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatHomeService;
+import de.juplo.kafka.chat.backend.persistence.storage.files.FilesStorageStrategy;
 import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
+import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomService;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,29 +20,35 @@ import java.time.Clock;
 public class ChatBackendConfiguration
 {
   @Bean
-  public ChatHome chatHome(
-      ChatroomFactory chatroomFactory,
-      StorageStrategy storageStrategy)
+  public ChatHome chatHome(ChatHomeService chatHomeService)
   {
-    return new ChatHome(chatroomFactory, storageStrategy.readChatrooms());
+    return new ChatHome(chatHomeService);
   }
 
   @Bean
-  public StorageStrategy storageStrategy(
-      ChatBackendProperties properties,
-      ObjectMapper mapper,
-      ChatroomFactory chatroomFactory)
+  InMemoryChatHomeService chatHomeService(
+      StorageStrategy storageStrategy,
+      Clock clock,
+      ChatBackendProperties properties)
   {
-    return new LocalJsonFilesStorageStrategy(
-        Paths.get(properties.getDatadir()),
-        mapper,
-        chatroomFactory);
+    return new InMemoryChatHomeService(
+        storageStrategy.read(),
+        clock,
+        properties.getChatroomBufferSize());
   }
 
   @Bean
-  ChatroomFactory chatroomFactory(ChatBackendProperties properties)
+  public StorageStrategy storageStrategy(
+      ChatBackendProperties properties,
+      Clock clock,
+      ObjectMapper mapper)
   {
-    return new InMemoryChatroomFactory(properties.getChatroomBufferSize());
+    return new FilesStorageStrategy(
+        Paths.get(properties.getStorageDirectory()),
+        clock,
+        properties.getChatroomBufferSize(),
+        messageFlux -> new InMemoryChatRoomService(messageFlux),
+        mapper);
   }
 
   @Bean