X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=f3efe791d098f850ee90ef963ec8530094916ea9;hb=8d997cc65763b3f12fb680da67f471590e6eeeb2;hp=9be7fa165dcf918d14e94f137fd9085e2f4dcfdc;hpb=5e0a716e62d5ab3820573c59a5fa5db7355844a4;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 9be7fa16..f3efe791 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,9 +1,8 @@
 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.ChatRoomFactory;
-import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
+import de.juplo.kafka.chat.backend.domain.ChatHomeService;
+import de.juplo.kafka.chat.backend.domain.ChatRoomData;
+import de.juplo.kafka.chat.backend.implementation.StorageStrategy;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.bind.annotation.*;
@@ -17,70 +16,66 @@ import java.util.UUID;
 @RequiredArgsConstructor
 public class ChatBackendController
 {
-  private final ChatHome[] chatHomes;
-  private final ShardingStrategy selectionStrategy;
-  private final ChatRoomFactory factory;
+  private final ChatHomeService chatHomeService;
   private final StorageStrategy storageStrategy;
 
 
   @PostMapping("create")
-  public Mono<ChatRoomTo> create(@RequestBody String name)
+  public Mono<ChatRoomInfoTo> create(@RequestBody String name)
   {
     UUID chatRoomId = UUID.randomUUID();
-    return factory
+    return chatHomeService
         .createChatRoom(chatRoomId, name)
-        .flatMap(chatRoom -> chatHomes[chatRoom.getShard()].putChatRoom(chatRoom))
-        .map(ChatRoomTo::from);
+        .map(ChatRoomInfoTo::from);
   }
 
   @GetMapping("list")
-  public Flux<ChatRoomTo> list()
+  public Flux<ChatRoomInfoTo> list()
   {
-    return Flux
-        .fromArray(chatHomes)
-        .flatMap(chatHome -> chatHome.getChatRooms())
-        .map(chatroom -> ChatRoomTo.from(chatroom));
+    return chatHomeService
+        .getChatRoomInfo()
+        .map(chatroomInfo -> ChatRoomInfoTo.from(chatroomInfo));
   }
 
-  @GetMapping("{chatroomId}/list")
-  public Flux<MessageTo> list(@PathVariable UUID chatroomId)
+  @GetMapping("{chatRoomId}/list")
+  public Flux<MessageTo> list(@PathVariable UUID chatRoomId)
   {
-    return chatHomes[selectShard(chatroomId)]
-        .getChatRoom(chatroomId)
-        .flatMapMany(chatroom -> chatroom
+    return chatHomeService
+        .getChatRoomData(chatRoomId)
+        .flatMapMany(chatRoomData -> chatRoomData
             .getMessages()
             .map(MessageTo::from));
   }
 
-  @GetMapping("{chatroomId}")
-  public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
+  @GetMapping("{chatRoomId}")
+  public Mono<ChatRoomInfoTo> get(@PathVariable UUID chatRoomId)
   {
-    return chatHomes[selectShard(chatroomId)]
-        .getChatRoom(chatroomId)
-        .map(chatroom -> ChatRoomTo.from(chatroom));
+    return chatHomeService
+        .getChatRoomInfo(chatRoomId)
+        .map(chatRoomInfo -> ChatRoomInfoTo.from(chatRoomInfo));
   }
 
-  @PutMapping("{chatroomId}/{username}/{messageId}")
+  @PutMapping("{chatRoomId}/{username}/{messageId}")
   public Mono<MessageTo> put(
-      @PathVariable UUID chatroomId,
+      @PathVariable UUID chatRoomId,
       @PathVariable String username,
       @PathVariable Long messageId,
       @RequestBody String text)
   {
     return
-        chatHomes[selectShard(chatroomId)]
-            .getChatRoom(chatroomId)
-            .flatMap(chatroom -> put(chatroom, username, messageId, text));
+        chatHomeService
+            .getChatRoomData(chatRoomId)
+            .flatMap(chatRoomData -> put(chatRoomData, username, messageId, text));
   }
 
-  public Mono<MessageTo> put(
-      ChatRoom chatroom,
+  private Mono<MessageTo> put(
+      ChatRoomData chatRoomData,
       String username,
       Long messageId,
       String text)
   {
     return
-        chatroom
+        chatRoomData
             .addMessage(
                 messageId,
                 username,
@@ -88,40 +83,40 @@ public class ChatBackendController
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping("{chatroomId}/{username}/{messageId}")
+  @GetMapping("{chatRoomId}/{username}/{messageId}")
   public Mono<MessageTo> get(
-      @PathVariable UUID chatroomId,
+      @PathVariable UUID chatRoomId,
       @PathVariable String username,
       @PathVariable Long messageId)
   {
     return
-        chatHomes[selectShard(chatroomId)]
-            .getChatRoom(chatroomId)
-            .flatMap(chatroom -> get(chatroom, username, messageId));
+        chatHomeService
+            .getChatRoomData(chatRoomId)
+            .flatMap(chatRoomData -> get(chatRoomData, username, messageId));
   }
 
   private Mono<MessageTo> get(
-      ChatRoom chatroom,
+      ChatRoomData chatRoomData,
       String username,
       Long messageId)
   {
     return
-        chatroom
+        chatRoomData
             .getMessage(username, messageId)
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping(path = "{chatroomId}/listen")
-  public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
+  @GetMapping(path = "{chatRoomId}/listen")
+  public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatRoomId)
   {
-    return chatHomes[selectShard(chatroomId)]
-        .getChatRoom(chatroomId)
-        .flatMapMany(chatroom -> listen(chatroom));
+    return chatHomeService
+        .getChatRoomData(chatRoomId)
+        .flatMapMany(chatRoomData -> listen(chatRoomData));
   }
 
-  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
+  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoomData chatRoomData)
   {
-    return chatroom
+    return chatRoomData
         .listen()
         .log()
         .map(message -> MessageTo.from(message))
@@ -133,15 +128,15 @@ public class ChatBackendController
                 .build());
   }
 
-  @PostMapping("/store")
-  public void store()
+  @GetMapping("/shards")
+  public Mono<String[]> getShardOwners()
   {
-    for (int shard = 0; shard < chatHomes.length; shard++)
-      storageStrategy.write(chatHomes[shard].getChatRooms());
+    return chatHomeService.getShardOwners();
   }
 
-  private int selectShard(UUID chatroomId)
+  @PostMapping("/store")
+  public void store()
   {
-    return selectionStrategy.selectShard(chatroomId);
+    storageStrategy.write(chatHomeService);
   }
 }