X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatHome.java;h=773cd4cfb0b8dde077df9ee0cfa471dda49d86f3;hb=ea7355fdc971c3f20271b2ab38d11f8489ec16b3;hp=a75a9a1312a00b4981acfab4b0194a3803b4bb13;hpb=8e11510f956a4370044ef5819a53664df6ad1dcd;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
index a75a9a13..773cd4cf 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
@@ -1,31 +1,40 @@
 package de.juplo.kafka.chat.backend.domain;
 
-import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Flux;
 
 import java.util.*;
+import java.util.stream.Stream;
 
 
-@RequiredArgsConstructor
+@Slf4j
 public class ChatHome
 {
-  private final Map<UUID, Chatroom> chatrooms = new HashMap<>();
-  private final ChatroomFactory factory;
+  private final Map<UUID, Chatroom> chatrooms;
+  private final ChatHomeService service;
 
+  public ChatHome(ChatHomeService service, Flux<Chatroom> chatroomFlux)
+  {
+    log.debug("Creating ChatHome with factory: {}", service);
+    this.service = service;
+    this.chatrooms = new HashMap<>();
+    chatroomFlux.subscribe(chatroom -> chatrooms.put(chatroom.getId(), chatroom));
+  }
 
   public Chatroom createChatroom(String name)
   {
-    Chatroom chatroom = factory.createChatroom(UUID.randomUUID(), name);
+    Chatroom chatroom = service.createChatroom(UUID.randomUUID(), name);
     chatrooms.put(chatroom.getId(), chatroom);
     return chatroom;
   }
 
-  public Chatroom getChatroom(UUID id)
+  public Optional<Chatroom> getChatroom(UUID id)
   {
-    return chatrooms.get(id);
+    return Optional.ofNullable(chatrooms.get(id));
   }
 
-  public Collection<Chatroom> list()
+  public Stream<Chatroom> list()
   {
-    return chatrooms.values();
+    return chatrooms.values().stream();
   }
 }