projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: Refined `ChatBackendControllerTest` and fixed a bug in `ChatRoom`
[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
adabb92
..
68ccc4f
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,8
+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.ChatHome;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.juplo.kafka.chat.backend.domain.Chat
roomFactory
;
-import de.juplo.kafka.chat.backend.persistence.InMemoryChat
roomFactory
;
+import de.juplo.kafka.chat.backend.domain.Chat
HomeService
;
+import de.juplo.kafka.chat.backend.persistence.InMemoryChat
HomeService
;
import de.juplo.kafka.chat.backend.persistence.LocalJsonFilesStorageStrategy;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import de.juplo.kafka.chat.backend.persistence.LocalJsonFilesStorageStrategy;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@
-19,31
+19,34
@@
import java.time.Clock;
public class ChatBackendConfiguration
{
@Bean
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);
+ return new ChatHome(chatHomeService);
}
@Bean
}
@Bean
-
public StorageStrategy storageStrategy
(
-
ChatBackendProperties properties
,
-
ObjectMapper mapper
,
- Chat
roomFactory chatroomFactory
)
+
InMemoryChatHomeService chatHomeService
(
+
StorageStrategy storageStrategy
,
+
Clock clock
,
+ Chat
BackendProperties properties
)
{
{
- return new
LocalJsonFilesStorageStrategy
(
-
Paths.get(properties.getDatadir()
),
-
mapper
,
-
chatroomFactory
);
+ return new
InMemoryChatHomeService
(
+
storageStrategy.readChatrooms(
),
+
clock
,
+
properties.getChatroomBufferSize()
);
}
@Bean
}
@Bean
- ChatroomFactory chatroomFactory(ChatBackendProperties properties)
+ public StorageStrategy storageStrategy(
+ ChatBackendProperties properties,
+ Clock clock,
+ ObjectMapper mapper)
{
{
- return new InMemoryChatroomFactory(properties.getChatroomBufferSize());
+ return new LocalJsonFilesStorageStrategy(
+ Paths.get(properties.getDatadir()),
+ clock,
+ properties.getChatroomBufferSize(),
+ mapper);
}
@Bean
}
@Bean