X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FChatBackendConfiguration.java;h=6e74bb01bc1001ac796fd28c1d55d83fb33ac797;hb=ff98b068a91fc9e60e51bd4a95065633bb8ed2db;hp=adabb922b3d4505d102a235482f96542d558195e;hpb=6c96b0b685b7fece1761f9471d5f0689171956ed;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 adabb922..6e74bb01 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
@@ -1,16 +1,13 @@
 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.ChatHomeFactory;
+import de.juplo.kafka.chat.backend.domain.ChatHomeService;
 import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.nio.file.Paths;
 import java.time.Clock;
 
 
@@ -19,35 +16,25 @@ import java.time.Clock;
 public class ChatBackendConfiguration
 {
   @Bean
-  public ChatHome chatHome(
-      ChatroomFactory chatroomFactory,
-      StorageStrategy storageStrategy)
-  {
-    return new ChatHome(
-        storageStrategy.readChatrooms().collectMap(chatroom -> chatroom.getId()).block(),
-        chatroomFactory);
-  }
-
-  @Bean
-  public StorageStrategy storageStrategy(
+  ChatHome[] chatHomes(
+      ChatHomeFactory factory,
       ChatBackendProperties properties,
-      ObjectMapper mapper,
-      ChatroomFactory chatroomFactory)
-  {
-    return new LocalJsonFilesStorageStrategy(
-        Paths.get(properties.getDatadir()),
-        mapper,
-        chatroomFactory);
-  }
-
-  @Bean
-  ChatroomFactory chatroomFactory(ChatBackendProperties properties)
+      StorageStrategy storageStrategy)
   {
-    return new InMemoryChatroomFactory(properties.getChatroomBufferSize());
+    ChatHome[] chatHomes = new ChatHome[properties.getInmemory().getNumShards()];
+    storageStrategy
+        .read()
+        .subscribe(chatRoom ->
+        {
+          int shard = chatRoom.getShard();
+          if (chatHomes[shard] == null)
+            chatHomes[shard] = factory.createChatHome(shard);
+        });
+    return chatHomes;
   }
 
   @Bean
-  public Clock clock()
+  Clock clock()
   {
     return Clock.systemDefaultZone();
   }