projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactore: Renamed `Chatroom` to `ChatRoom` -- Rename
[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
4aaf4f5
..
e7fc483
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,10
+1,10
@@
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.Chat
r
oom;
+import de.juplo.kafka.chat.backend.domain.Chat
R
oom;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
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;
@@
-37,6
+37,17
@@
public class ChatBackendController
return chatHome.list().map(chatroom -> ChatroomTo.from(chatroom));
}
return chatHome.list().map(chatroom -> ChatroomTo.from(chatroom));
}
+ @GetMapping("list/{chatroomId}")
+ public Flux<MessageTo> list(@PathVariable UUID chatroomId)
+ {
+ return chatHome
+ .getChatroom(chatroomId)
+ .map(chatroom -> chatroom
+ .getMessages()
+ .map(MessageTo::from))
+ .get();
+ }
+
@GetMapping("get/{chatroomId}")
public Optional<ChatroomTo> get(@PathVariable UUID chatroomId)
{
@GetMapping("get/{chatroomId}")
public Optional<ChatroomTo> get(@PathVariable UUID chatroomId)
{
@@
-58,7
+69,7
@@
public class ChatBackendController
}
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)
@@
-88,7
+99,7
@@
public class ChatBackendController
}
private Mono<MessageTo> get(
}
private Mono<MessageTo> get(
- Chat
r
oom chatroom,
+ Chat
R
oom chatroom,
String username,
Long messageId)
{
String username,
Long messageId)
{
@@
-98,10
+109,8
@@
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 = "listen/{chatroomId}")
+ public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
.getChatroom(chatroomId)
{
return chatHome
.getChatroom(chatroomId)
@@
-109,12
+118,18
@@
public class ChatBackendController
.orElseThrow(() -> new UnknownChatroomException(chatroomId));
}
.orElseThrow(() -> new UnknownChatroomException(chatroomId));
}
- 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")
}
@PostMapping("/store")