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
e7fc483
..
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
@@
-9,11
+9,7
@@
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.Optional;
import java.util.UUID;
import java.util.UUID;
-import java.util.stream.Stream;
@RestController
@RestController
@@
-21,37
+17,35
@@
import java.util.stream.Stream;
public class ChatBackendController
{
private final ChatHome chatHome;
public class ChatBackendController
{
private final ChatHome chatHome;
- private final Clock clock;
private final StorageStrategy storageStrategy;
@PostMapping("create")
private final StorageStrategy storageStrategy;
@PostMapping("create")
- public
ChatroomTo
create(@RequestBody String name)
+ public
Mono<ChatRoomTo>
create(@RequestBody String name)
{
{
- return
ChatroomTo.from(chatHome.createChatroom(name)
);
+ return
chatHome.createChatroom(name).map(ChatRoomTo::from
);
}
@GetMapping("list")
}
@GetMapping("list")
- public
Stream<Chatr
oomTo> list()
+ public
Flux<ChatR
oomTo> list()
{
{
- return chatHome.
list().map(chatroom -> Chatr
oomTo.from(chatroom));
+ return chatHome.
getChatRooms().map(chatroom -> ChatR
oomTo.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)
- .
map
(chatroom -> chatroom
+ .getChat
R
oom(chatroomId)
+ .
flatMapMany
(chatroom -> chatroom
.getMessages()
.getMessages()
- .map(MessageTo::from))
- .get();
+ .map(MessageTo::from));
}
@GetMapping("get/{chatroomId}")
}
@GetMapping("get/{chatroomId}")
- public
Optional<Chatr
oomTo> get(@PathVariable UUID chatroomId)
+ public
Mono<ChatR
oomTo> get(@PathVariable UUID chatroomId)
{
{
- return chatHome.getChat
room(chatroomId).map(chatroom -> Chatr
oomTo.from(chatroom));
+ return chatHome.getChat
Room(chatroomId).map(chatroom -> ChatR
oomTo.from(chatroom));
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
@@
-63,9
+57,8
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> put(chatroom, username, messageId, text))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> put(chatroom, username, messageId, text));
}
public Mono<MessageTo> put(
}
public Mono<MessageTo> put(
@@
-78,10
+71,8
@@
public class ChatBackendController
chatroom
.addMessage(
messageId,
chatroom
.addMessage(
messageId,
- LocalDateTime.now(clock),
username,
text)
username,
text)
- .switchIfEmpty(chatroom.getMessage(username, messageId))
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
@@
-93,9
+84,8
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> get(chatroom, username, messageId))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> get(chatroom, username, messageId));
}
private Mono<MessageTo> get(
}
private Mono<MessageTo> get(
@@
-113,9
+103,8
@@
public class ChatBackendController
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> listen(chatroom))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMapMany(chatroom -> listen(chatroom));
}
private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
}
private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
@@
-135,6
+124,6
@@
public class ChatBackendController
@PostMapping("/store")
public void store()
{
@PostMapping("/store")
public void store()
{
- storageStrategy.writeChatrooms(
Flux.fromStream(chatHome.list()
));
+ storageStrategy.writeChatrooms(
chatHome.getChatRooms(
));
}
}
}
}