projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
ed4d8c7
..
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,39
+2,42
@@
package de.juplo.kafka.chat.backend.domain;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
import java.util.*;
import java.util.*;
-import java.util.stream.Stream;
@Slf4j
public class ChatHome
{
@Slf4j
public class ChatHome
{
- private final Map<UUID, Chat
r
oom> chatrooms;
- private final Chat
roomFactory factory
;
+ private final Map<UUID, Chat
R
oom> chatrooms;
+ private final Chat
HomeService service
;
- public ChatHome(Chat
roomFactory factory, Flux<Chatr
oom> chatroomFlux)
+ public ChatHome(Chat
HomeService service, Flux<ChatR
oom> chatroomFlux)
{
{
- log.debug("Creating ChatHome with factory: {}",
factory
);
- this.
factory = factory
;
+ log.debug("Creating ChatHome with factory: {}",
service
);
+ this.
service = service
;
this.chatrooms = new HashMap<>();
chatroomFlux.subscribe(chatroom -> chatrooms.put(chatroom.getId(), chatroom));
}
this.chatrooms = new HashMap<>();
chatroomFlux.subscribe(chatroom -> chatrooms.put(chatroom.getId(), chatroom));
}
- public
Chatroom
createChatroom(String name)
+ public
Mono<ChatRoom>
createChatroom(String name)
{
{
- Chat
room chatroom = factory
.createChatroom(UUID.randomUUID(), name);
+ Chat
Room chatroom = service
.createChatroom(UUID.randomUUID(), name);
chatrooms.put(chatroom.getId(), chatroom);
chatrooms.put(chatroom.getId(), chatroom);
- return
chatroom
;
+ return
Mono.just(chatroom)
;
}
}
- public
Optional<Chatr
oom> getChatroom(UUID id)
+ public
Mono<ChatR
oom> 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<Chatr
oom> list()
+ public
Flux<ChatR
oom> list()
{
{
- return
chatrooms.values().stream(
);
+ return
Flux.fromStream(chatrooms.values().stream()
);
}
}
}
}