X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=d0d276342037ea3939a555d0bececac688578085;hb=8adc14c2abeacb3605b0638afa95b1e4eea9e087;hp=68d056ba9f6c157d4943450aaadb9f8a07a4af24;hpb=f9b0d9a71a85741983a451a51fdbd1c38632be87;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 68d056ba..d0d27634 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
@@ -29,26 +29,26 @@ public class ChatBackendController
   @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
-        .getChatroom(chatroomId)
+        .getChatRoom(chatroomId)
         .flatMapMany(chatroom -> chatroom
             .getMessages()
             .map(MessageTo::from));
   }
 
-  @GetMapping("get/{chatroomId}")
+  @GetMapping("{chatroomId}")
   public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
   {
-    return chatHome.getChatroom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
+    return chatHome.getChatRoom(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,
@@ -57,7 +57,7 @@ public class ChatBackendController
   {
     return
         chatHome
-            .getChatroom(chatroomId)
+            .getChatRoom(chatroomId)
             .flatMap(chatroom -> put(chatroom, username, messageId, text));
   }
 
@@ -73,11 +73,10 @@ public class ChatBackendController
                 messageId,
                 username,
                 text)
-            .switchIfEmpty(chatroom.getMessage(username, messageId))
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping("get/{chatroomId}/{username}/{messageId}")
+  @GetMapping("{chatroomId}/{username}/{messageId}")
   public Mono<MessageTo> get(
       @PathVariable UUID chatroomId,
       @PathVariable String username,
@@ -85,7 +84,7 @@ public class ChatBackendController
   {
     return
         chatHome
-            .getChatroom(chatroomId)
+            .getChatRoom(chatroomId)
             .flatMap(chatroom -> get(chatroom, username, messageId));
   }
 
@@ -100,11 +99,11 @@ public class ChatBackendController
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping(path = "listen/{chatroomId}")
+  @GetMapping(path = "{chatroomId}/listen")
   public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
   {
     return chatHome
-        .getChatroom(chatroomId)
+        .getChatRoom(chatroomId)
         .flatMapMany(chatroom -> listen(chatroom));
   }
 
@@ -125,6 +124,6 @@ public class ChatBackendController
   @PostMapping("/store")
   public void store()
   {
-    storageStrategy.writeChatrooms(chatHome.list());
+    storageStrategy.write(chatHome.getChatRooms());
   }
 }