X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=f41f45f63c522a6d27d1e5143da3741aee6a00c0;hb=21d8ee5873a5d6ca44fb73a8e20a6b6fd4557c0d;hp=1c0224bc6e7c0f5be7df2942af533ccafe3f14d6;hpb=9d61871563f4be4850cebca4fad0545d504522c3;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 1c0224bc..f41f45f6 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
@@ -2,7 +2,6 @@ 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 lombok.RequiredArgsConstructor;
 import org.springframework.http.codec.ServerSentEvent;
@@ -17,36 +16,31 @@ import java.util.UUID;
 @RequiredArgsConstructor
 public class ChatBackendController
 {
-  private final ChatHome[] chatHomes;
-  private final ShardingStrategy selectionStrategy;
-  private final ChatRoomFactory factory;
+  private final ChatHome chatHome;
   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 chatHome
         .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 chatHome
+        .getChatRooms()
+        .map(chatroom -> ChatRoomInfoTo.from(chatroom));
   }
 
   @GetMapping("{chatroomId}/list")
   public Flux<MessageTo> list(@PathVariable UUID chatroomId)
   {
-    int shard = selectionStrategy.selectShard(chatroomId);
-    return chatHomes[shard]
+    return chatHome
         .getChatRoom(chatroomId)
         .flatMapMany(chatroom -> chatroom
             .getMessages()
@@ -54,12 +48,11 @@ public class ChatBackendController
   }
 
   @GetMapping("{chatroomId}")
-  public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
+  public Mono<ChatRoomInfoTo> get(@PathVariable UUID chatroomId)
   {
-    int shard = selectionStrategy.selectShard(chatroomId);
-    return chatHomes[shard]
+    return chatHome
         .getChatRoom(chatroomId)
-        .map(chatroom -> ChatRoomTo.from(chatroom));
+        .map(chatroom -> ChatRoomInfoTo.from(chatroom));
   }
 
   @PutMapping("{chatroomId}/{username}/{messageId}")
@@ -69,14 +62,13 @@ public class ChatBackendController
       @PathVariable Long messageId,
       @RequestBody String text)
   {
-    int shard = selectionStrategy.selectShard(chatroomId);
     return
-        chatHomes[shard]
+        chatHome
             .getChatRoom(chatroomId)
             .flatMap(chatroom -> put(chatroom, username, messageId, text));
   }
 
-  public Mono<MessageTo> put(
+  private Mono<MessageTo> put(
       ChatRoom chatroom,
       String username,
       Long messageId,
@@ -97,9 +89,8 @@ public class ChatBackendController
       @PathVariable String username,
       @PathVariable Long messageId)
   {
-    int shard = selectionStrategy.selectShard(chatroomId);
     return
-        chatHomes[shard]
+        chatHome
             .getChatRoom(chatroomId)
             .flatMap(chatroom -> get(chatroom, username, messageId));
   }
@@ -118,8 +109,7 @@ public class ChatBackendController
   @GetMapping(path = "{chatroomId}/listen")
   public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
   {
-    int shard = selectionStrategy.selectShard(chatroomId);
-    return chatHomes[shard]
+    return chatHome
         .getChatRoom(chatroomId)
         .flatMapMany(chatroom -> listen(chatroom));
   }
@@ -141,7 +131,6 @@ public class ChatBackendController
   @PostMapping("/store")
   public void store()
   {
-    for (int shard = 0; shard < chatHomes.length; shard++)
-      storageStrategy.write(chatHomes[shard].getChatRooms());
+    storageStrategy.write(chatHome.getChatRooms());
   }
 }