projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: refined the endpoint-uri's
[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
..
d0d2763
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,26
+29,26
@@
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}
")
+ @GetMapping("
{chatroomId}/list
")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
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));
}
- @GetMapping("
get/
{chatroomId}")
+ @GetMapping("{chatroomId}")
public Mono<ChatRoomTo> get(@PathVariable UUID 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("{chatroomId}/{username}/{messageId}")
public Mono<MessageTo> put(
@PathVariable UUID chatroomId,
@PathVariable String username,
public Mono<MessageTo> put(
@PathVariable UUID chatroomId,
@PathVariable String username,
@@
-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,11
+73,10
@@
public class ChatBackendController
messageId,
username,
text)
messageId,
username,
text)
- .switchIfEmpty(chatroom.getMessage(username, messageId))
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
- @GetMapping("
get/
{chatroomId}/{username}/{messageId}")
+ @GetMapping("{chatroomId}/{username}/{messageId}")
public Mono<MessageTo> get(
@PathVariable UUID chatroomId,
@PathVariable String username,
public Mono<MessageTo> get(
@PathVariable UUID chatroomId,
@PathVariable String username,
@@
-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));
}
@@
-100,11
+99,11
@@
public class ChatBackendController
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
- @GetMapping(path = "
listen/{chatroomId}
")
+ @GetMapping(path = "
{chatroomId}/listen
")
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.write
Chatrooms(chatHome.list
());
+ storageStrategy.write
(chatHome.getChatRooms
());
}
}
}
}