projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: Moved persistence-logic from `ChatHome` into `ChatHomeService`
[demos/kafka/chat]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
chat
/
backend
/
api
/
ChatBackendController.java
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
index
68d056b
..
e7a6f1a
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
@@
-29,14
+29,14
@@
public class ChatBackendController
@GetMapping("list")
public Flux<ChatRoomTo> list()
{
@GetMapping("list")
public Flux<ChatRoomTo> list()
{
- return chatHome.
list
().map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome.
getChatRooms
().map(chatroom -> ChatRoomTo.from(chatroom));
}
@GetMapping("list/{chatroomId}")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
}
@GetMapping("list/{chatroomId}")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
- .getChat
r
oom(chatroomId)
+ .getChat
R
oom(chatroomId)
.flatMapMany(chatroom -> chatroom
.getMessages()
.map(MessageTo::from));
.flatMapMany(chatroom -> chatroom
.getMessages()
.map(MessageTo::from));
@@
-45,7
+45,7
@@
public class ChatBackendController
@GetMapping("get/{chatroomId}")
public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
{
@GetMapping("get/{chatroomId}")
public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
{
- return chatHome.getChat
r
oom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome.getChat
R
oom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
@@
-57,7
+57,7
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChat
r
oom(chatroomId)
+ .getChat
R
oom(chatroomId)
.flatMap(chatroom -> put(chatroom, username, messageId, text));
}
.flatMap(chatroom -> put(chatroom, username, messageId, text));
}
@@
-73,7
+73,6
@@
public class ChatBackendController
messageId,
username,
text)
messageId,
username,
text)
- .switchIfEmpty(chatroom.getMessage(username, messageId))
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
@@
-85,7
+84,7
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChat
r
oom(chatroomId)
+ .getChat
R
oom(chatroomId)
.flatMap(chatroom -> get(chatroom, username, messageId));
}
.flatMap(chatroom -> get(chatroom, username, messageId));
}
@@
-104,7
+103,7
@@
public class ChatBackendController
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
- .getChat
r
oom(chatroomId)
+ .getChat
R
oom(chatroomId)
.flatMapMany(chatroom -> listen(chatroom));
}
.flatMapMany(chatroom -> listen(chatroom));
}
@@
-125,6
+124,6
@@
public class ChatBackendController
@PostMapping("/store")
public void store()
{
@PostMapping("/store")
public void store()
{
- storageStrategy.writeChatrooms(chatHome.
list
());
+ storageStrategy.writeChatrooms(chatHome.
getChatRooms
());
}
}
}
}