X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FChatBackendConfiguration.java;h=68ccc4fe6a1aab240fac9f0e3139e9752577aebf;hb=aa0efd1151673c5f0f1576c3026f6fdd0dfad691;hp=835627a0096273dfda01704add76cd5193051a79;hpb=8e11510f956a4370044ef5819a53664df6ad1dcd;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 835627a0..68ccc4fe 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
@@ -1,34 +1,52 @@
 package de.juplo.kafka.chat.backend;
 
 import de.juplo.kafka.chat.backend.domain.ChatHome;
-import de.juplo.kafka.chat.backend.domain.ChatroomFactory;
-import de.juplo.kafka.chat.backend.persistence.InMemoryChatroomFactory;
-import de.juplo.kafka.chat.backend.persistence.InMemoryPersistenceStrategy;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.nio.file.Paths;
 import java.time.Clock;
 
 
 @Configuration
+@EnableConfigurationProperties(ChatBackendProperties.class)
 public class ChatBackendConfiguration
 {
   @Bean
-  public ChatHome chatHome(ChatroomFactory chatroomFactory)
+  public ChatHome chatHome(ChatHomeService chatHomeService)
   {
-    return new ChatHome(chatroomFactory);
+    return new ChatHome(chatHomeService);
   }
 
   @Bean
-  ChatroomFactory chatroomFactory(InMemoryPersistenceStrategy persistenceStrategy)
+  InMemoryChatHomeService chatHomeService(
+      StorageStrategy storageStrategy,
+      Clock clock,
+      ChatBackendProperties properties)
   {
-    return new InMemoryChatroomFactory(persistenceStrategy);
+    return new InMemoryChatHomeService(
+        storageStrategy.readChatrooms(),
+        clock,
+        properties.getChatroomBufferSize());
   }
 
   @Bean
-  InMemoryPersistenceStrategy persistenceStrategy()
+  public StorageStrategy storageStrategy(
+      ChatBackendProperties properties,
+      Clock clock,
+      ObjectMapper mapper)
   {
-    return new InMemoryPersistenceStrategy();
+    return new LocalJsonFilesStorageStrategy(
+        Paths.get(properties.getDatadir()),
+        clock,
+        properties.getChatroomBufferSize(),
+        mapper);
   }
 
   @Bean