X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2FChatBackendConfiguration.java;h=c196b7ee86ce02709e1a313a60693eb499506267;hb=9d61871563f4be4850cebca4fad0545d504522c3;hp=aea5f8ec06ad31cd1231ba30b3144a2469080745;hpb=ed4ccbab012c89663e077117c55142853fad5696;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 aea5f8ec..c196b7ee 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,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.persistence.StorageStrategy; +import de.juplo.kafka.chat.backend.domain.ChatHomeService; 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,31 +14,9 @@ import java.time.Clock; public class ChatBackendConfiguration { @Bean - public ChatHome chatHome( - ChatroomFactory chatroomFactory, - StorageStrategy storageStrategy) + public ChatHome chatHome(ChatHomeService chatHomeService) { - return new ChatHome( - storageStrategy.readChatrooms().collectMap(chatroom -> chatroom.getId()).block(), - chatroomFactory); - } - - @Bean - public StorageStrategy storageStrategy( - ChatBackendProperties properties, - ObjectMapper mapper, - ChatroomFactory chatroomFactory) - { - return new LocalJsonFilesStorageStrategy( - Paths.get(properties.getDatadir()), - mapper, - chatroomFactory); - } - - @Bean - ChatroomFactory chatroomFactory() - { - return new InMemoryChatroomFactory(); + return new ChatHome(chatHomeService, 0); } @Bean