X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=e7fc483ca67121d2120c810895796a27557c7eca;hb=a35ac0e02622cb5638380612064467c2309ebee5;hp=4aaf4f57789b468806c361d4550cc522bc7baa07;hpb=c91dacfc3c7b3764d7c5925a4fb327677a0eadbb;p=demos%2Fkafka%2Fchat

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 4aaf4f57..e7fc483c 100644
--- 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;
-import de.juplo.kafka.chat.backend.domain.Chatroom;
+import de.juplo.kafka.chat.backend.domain.ChatRoom;
 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;
@@ -37,6 +37,17 @@ public class ChatBackendController
     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)
   {
@@ -58,7 +69,7 @@ public class ChatBackendController
   }
 
   public Mono<MessageTo> put(
-      Chatroom chatroom,
+      ChatRoom chatroom,
       String username,
       Long messageId,
       String text)
@@ -88,7 +99,7 @@ public class ChatBackendController
   }
 
   private Mono<MessageTo> get(
-      Chatroom chatroom,
+      ChatRoom chatroom,
       String username,
       Long messageId)
   {
@@ -98,10 +109,8 @@ public class ChatBackendController
             .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)
@@ -109,12 +118,18 @@ public class ChatBackendController
         .orElseThrow(() -> new UnknownChatroomException(chatroomId));
   }
 
-  private Flux<MessageTo> listen(Chatroom chatroom)
+  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
   {
     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")