fix: Asserted, that `ChatHome` acts, as expected, if asked for a `ChatRoom`

[demos/kafka/chat] / src / main / java / de / juplo / kafka / chat / backend / domain / ChatHome.java

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 773cd4c..bb4d89c 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
@@ -2,18 +2,18 @@ package de.juplo.kafka.chat.backend.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.*;
-import java.util.stream.Stream;
 
 
 @Slf4j
 public class ChatHome
 {
-  private final Map<UUID, Chatroom> chatrooms;
+  private final Map<UUID, ChatRoom> chatrooms;
   private final ChatHomeService service;
 
-  public ChatHome(ChatHomeService service, Flux<Chatroom> chatroomFlux)
+  public ChatHome(ChatHomeService service, Flux<ChatRoom> chatroomFlux)
   {
     log.debug("Creating ChatHome with factory: {}", service);
     this.service = service;
@@ -21,20 +21,23 @@ public class ChatHome
     chatroomFlux.subscribe(chatroom -> chatrooms.put(chatroom.getId(), chatroom));
   }
 
-  public Chatroom createChatroom(String name)
+  public Mono<ChatRoom> createChatroom(String name)
   {
-    Chatroom chatroom = service.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());
   }
 }