projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: Pulled business-logic into class `ShardedChatHome`
[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
7d1655d
..
36bec48
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
@@
-1,17
+1,15
@@
package de.juplo.kafka.chat.backend.api;
import de.juplo.kafka.chat.backend.domain.ChatHome;
package de.juplo.kafka.chat.backend.api;
import de.juplo.kafka.chat.backend.domain.ChatHome;
-import de.juplo.kafka.chat.backend.domain.Chatroom;
+import de.juplo.kafka.chat.backend.domain.ChatRoom;
+import de.juplo.kafka.chat.backend.domain.ChatRoomFactory;
+import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import lombok.RequiredArgsConstructor;
-import org.springframework.http.
MediaType
;
+import org.springframework.http.
codec.ServerSentEvent
;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.Optional;
import java.util.UUID;
import java.util.UUID;
@@
-20,28
+18,47
@@
import java.util.UUID;
public class ChatBackendController
{
private final ChatHome chatHome;
public class ChatBackendController
{
private final ChatHome chatHome;
- private final Clock clock;
+ private final ChatRoomFactory factory;
+ private final StorageStrategy storageStrategy;
@PostMapping("create")
@PostMapping("create")
- public
Chatroom
create(@RequestBody String name)
+ public
Mono<ChatRoomTo>
create(@RequestBody String name)
{
{
- return chatHome.createChatroom(name);
+ UUID chatRoomId = UUID.randomUUID();
+ return factory
+ .createChatRoom(chatRoomId, name)
+ .flatMap(chatRoom -> chatHome.putChatRoom(chatRoom))
+ .map(ChatRoomTo::from);
}
@GetMapping("list")
}
@GetMapping("list")
- public
Collection<Chatroom
> list()
+ public
Flux<ChatRoomTo
> list()
{
{
- return chatHome.list();
+ return chatHome
+ .getChatRooms()
+ .map(chatroom -> ChatRoomTo.from(chatroom));
}
}
- @GetMapping("
get/{chatroomId}
")
- public
Optional<Chatroom> ge
t(@PathVariable UUID chatroomId)
+ @GetMapping("
{chatroomId}/list
")
+ public
Flux<MessageTo> lis
t(@PathVariable UUID chatroomId)
{
{
- return chatHome.getChatroom(chatroomId);
+ return chatHome
+ .getChatRoom(chatroomId)
+ .flatMapMany(chatroom -> chatroom
+ .getMessages()
+ .map(MessageTo::from));
}
}
- @PutMapping("put/{chatroomId}/{username}/{messageId}")
+ @GetMapping("{chatroomId}")
+ public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
+ {
+ return chatHome
+ .getChatRoom(chatroomId)
+ .map(chatroom -> ChatRoomTo.from(chatroom));
+ }
+
+ @PutMapping("{chatroomId}/{username}/{messageId}")
public Mono<MessageTo> put(
@PathVariable UUID chatroomId,
@PathVariable String username,
public Mono<MessageTo> put(
@PathVariable UUID chatroomId,
@PathVariable String username,
@@
-50,13
+67,12
@@
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(
- Chat
r
oom chatroom,
+ Chat
R
oom chatroom,
String username,
Long messageId,
String text)
String username,
Long messageId,
String text)
@@
-65,14
+81,12
@@
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));
}
- @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,
@@
-80,13
+94,12
@@
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(
- Chat
r
oom chatroom,
+ Chat
R
oom chatroom,
String username,
Long messageId)
{
String username,
Long messageId)
{
@@
-96,22
+109,31
@@
public class ChatBackendController
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
- @GetMapping(
- path = "listen/{chatroomId}",
- produces = MediaType.TEXT_EVENT_STREAM_VALUE)
- public Flux<MessageTo> listen(@PathVariable UUID chatroomId)
+ @GetMapping(path = "{chatroomId}/listen")
+ public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
{
return chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> listen(chatroom))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMapMany(chatroom -> listen(chatroom));
}
}
- private Flux<
MessageTo> listen(Chatr
oom chatroom)
+ private Flux<
ServerSentEvent<MessageTo>> listen(ChatR
oom chatroom)
{
return chatroom
.listen()
.log()
{
return chatroom
.listen()
.log()
- .map(message -> MessageTo.from(message));
+ .map(message -> MessageTo.from(message))
+ .map(messageTo ->
+ ServerSentEvent
+ .builder(messageTo)
+ .id(messageTo.getSerial().toString())
+ .event("message")
+ .build());
+ }
+
+ @PostMapping("/store")
+ public void store()
+ {
+ storageStrategy.write(chatHome.getChatRooms());
}
}
}
}