X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatHome.java;h=13f18b913fde4082b68823fb6d0a3d45b2e15b9d;hb=f9b0d9a71a85741983a451a51fdbd1c38632be87;hp=773cd4cfb0b8dde077df9ee0cfa471dda49d86f3;hpb=ea7355fdc971c3f20271b2ab38d11f8489ec16b3;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 773cd4cf..13f18b91 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
@@ -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,22 @@ 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.justOrEmpty(chatroom);
   }
 
-  public Optional<Chatroom> getChatroom(UUID id)
+  public Mono<ChatRoom> getChatroom(UUID id)
   {
-    return Optional.ofNullable(chatrooms.get(id));
+    return Mono
+        .justOrEmpty(chatrooms.get(id))
+        .or(Mono.error(() -> new UnknownChatroomException(id)));
   }
 
-  public Stream<Chatroom> list()
+  public Flux<ChatRoom> list()
   {
-    return chatrooms.values().stream();
+    return Flux.fromStream(chatrooms.values().stream());
   }
 }