X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2Finmemory%2FSimpleChatHome.java;h=2987dd43852f561c83a955e4444209ef9bf595b4;hb=1a6e2af4b700d92efe20ce5099affc01413c6eaa;hp=f99bc9d8c1e49997c6b9635a5569433f6fb45dd7;hpb=e9a4bf3c31d504611fba0cc0be4a1e04812e2c65;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
index f99bc9d8..2987dd43 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
@@ -13,37 +13,54 @@ import java.util.*;
 @Slf4j
 public class SimpleChatHome implements ChatHome
 {
-  private final InMemoryChatHomeService service;
-  private final int shard;
+  private final Map<UUID, ChatRoom> chatrooms;
 
 
-  public SimpleChatHome(InMemoryChatHomeService service, int shard)
+
+  public SimpleChatHome(Flux<ChatRoom> chatroomFlux)
   {
-    log.info("Created SimpleChatHome for shard {}", shard);
-    this.service = service;
-    this.shard = shard;
+    this(chatroomFlux, null);
   }
 
-  public SimpleChatHome(InMemoryChatHomeService service)
+  public SimpleChatHome(
+      Integer shard,
+      Flux<ChatRoom> chatroomFlux)
   {
-    this(service, 0);
+    log.info("Created SimpleChatHome for shard {}", shard);
+
+    this.chatrooms = new HashMap<>();
+    chatroomFlux
+        .filter(chatRoom ->
+        {
+          if (shard == null && chatRoom.getShard() == shard)
+          {
+            return true;
+          }
+          else
+          {
+            log.info(
+                "SimpleChatHome for shard {} ignores not owned chat-room {}",
+                shard,
+                chatRoom);
+            return false;
+          }
+        })
+        .toStream()
+        .forEach(chatroom -> chatrooms.put(chatroom.getId(), chatroom));
   }
 
 
   @Override
   public Mono<ChatRoom> getChatRoom(UUID id)
   {
-    return service
-        .getChatRoom(shard, id)
-        .switchIfEmpty(Mono.error(() -> new UnknownChatroomException(
-            id,
-            shard,
-            service.getOwnedShards())));
+    return Mono
+        .justOrEmpty(chatrooms.get(id))
+        .switchIfEmpty(Mono.error(() -> new UnknownChatroomException(id)));
   }
 
   @Override
   public Flux<ChatRoom> getChatRooms()
   {
-    return service.getChatRooms(shard);
+    return Flux.fromIterable(chatrooms.values());
   }
 }