X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FChatBackendConfiguration.java;h=05fc2cb7768f28aede043640b6b82dc358aca40e;hb=22c15a299f38649686d2677731aeb349e51224a5;hp=6387c6efa9236d0e58bf1dbb8dab5a9807e366ef;hpb=9e3e6397414722ad6f9a43381b4501edf4f56134;p=demos%2Fkafka%2Fchat

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 6387c6ef..05fc2cb7 100644
--- 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,8 @@ 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.domain.Message;
-import de.juplo.kafka.chat.backend.persistence.InMemoryChatroomFactory;
-import de.juplo.kafka.chat.backend.persistence.InMemoryPersistenceStrategy;
+import de.juplo.kafka.chat.backend.domain.ChatHomeService;
+import de.juplo.kafka.chat.backend.persistence.InMemoryChatHomeService;
 import de.juplo.kafka.chat.backend.persistence.LocalJsonFilesStorageStrategy;
 import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -14,7 +12,6 @@ import org.springframework.context.annotation.Configuration;
 
 import java.nio.file.Paths;
 import java.time.Clock;
-import java.util.LinkedHashMap;
 
 
 @Configuration
@@ -23,36 +20,30 @@ public class ChatBackendConfiguration
 {
   @Bean
   public ChatHome chatHome(
-      ChatroomFactory chatroomFactory,
+      ChatHomeService chatHomeService,
       StorageStrategy storageStrategy)
   {
-    return new ChatHome(
-        storageStrategy.readChatrooms().collectMap(chatroom -> chatroom.getId()).block(),
-        chatroomFactory);
+    return new ChatHome(chatHomeService, storageStrategy.readChatrooms());
   }
 
   @Bean
   public StorageStrategy storageStrategy(
       ChatBackendProperties properties,
       ObjectMapper mapper,
-      ChatroomFactory chatroomFactory)
+      InMemoryChatHomeService chatHomeService)
   {
     return new LocalJsonFilesStorageStrategy(
         Paths.get(properties.getDatadir()),
         mapper,
-        chatroomFactory);
+        chatHomeService);
   }
 
   @Bean
-  ChatroomFactory chatroomFactory(InMemoryPersistenceStrategy persistenceStrategy)
+  InMemoryChatHomeService chatHomeService(
+      Clock clock,
+      ChatBackendProperties properties)
   {
-    return new InMemoryChatroomFactory(persistenceStrategy);
-  }
-
-  @Bean
-  InMemoryPersistenceStrategy persistenceStrategy()
-  {
-    return new InMemoryPersistenceStrategy(new LinkedHashMap<>());
+    return new InMemoryChatHomeService(clock, properties.getChatroomBufferSize());
   }
 
   @Bean