X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatHome.java;h=bb4d89c5b4297ef86450a7a9592bfe95e3b983a3;hb=972a1f2c248a51740091c1fdf3526f0eb676639e;hp=d04bd73859236ea8285e13e6fefa4a3c11e8f0cd;hpb=14c6a8c34de8b46b7f1655558727fc1276afb036;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 d04bd738..bb4d89c5 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,32 +1,43 @@
 package de.juplo.kafka.chat.backend.domain;
 
-import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.*;
-import java.util.stream.Stream;
 
 
-@RequiredArgsConstructor
+@Slf4j
 public class ChatHome
 {
-  private final Map<UUID, Chatroom> chatrooms;
-  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)
+  public Mono<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;
+    return Mono.just(chatroom);
   }
 
-  public Optional<Chatroom> getChatroom(UUID id)
+  public Mono<ChatRoom> getChatroom(UUID id)
   {
-    return Optional.ofNullable(chatrooms.get(id));
+    ChatRoom chatroom = chatrooms.get(id);
+    return chatroom == null
+        ? Mono.error(() -> new UnknownChatroomException(id))
+        : Mono.just(chatroom);
   }
 
-  public Stream<Chatroom> list()
+  public Flux<ChatRoom> list()
   {
-    return chatrooms.values().stream();
+    return Flux.fromStream(chatrooms.values().stream());
   }
 }