X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2Finmemory%2FInMemoryChatHomeService.java;h=381f5dbe0be6c37b9c1411d1f62589078ec6b89c;hb=d7689f059964f8c6105b65bb3ee5a097fd106cb7;hp=0beb7f362a872b80bacb9e007d3b51804f4ab1cf;hpb=7dc64266c5675ead8214edb36173b80363e08b1f;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
index 0beb7f36..381f5dbe 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
@@ -1,8 +1,6 @@
 package de.juplo.kafka.chat.backend.persistence.inmemory;
 
 import de.juplo.kafka.chat.backend.domain.ChatRoom;
-import de.juplo.kafka.chat.backend.domain.ChatHomeService;
-import de.juplo.kafka.chat.backend.domain.ShardingStrategy;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -11,20 +9,17 @@ import java.util.*;
 
 
 @Slf4j
-public class InMemoryChatHomeService implements ChatHomeService<InMemoryChatRoomService>
+public class InMemoryChatHomeService implements ChatHomeService
 {
-  private final ShardingStrategy shardingStrategy;
   private final Map<UUID, ChatRoom>[] chatrooms;
 
 
   public InMemoryChatHomeService(
-      ShardingStrategy shardingStrategy,
       int numShards,
       int[] ownedShards,
       Flux<ChatRoom> chatroomFlux)
   {
     log.debug("Creating InMemoryChatHomeService");
-    this.shardingStrategy = shardingStrategy;
     this.chatrooms = new Map[numShards];
     Set<Integer> owned = Arrays
         .stream(ownedShards)
@@ -41,8 +36,7 @@ public class InMemoryChatHomeService implements ChatHomeService<InMemoryChatRoom
     chatroomFlux
         .filter(chatRoom ->
         {
-          int shard = shardingStrategy.selectShard(chatRoom.getId());
-          if (owned.contains(shard))
+          if (owned.contains(chatRoom.getShard()))
           {
             return true;
           }
@@ -53,17 +47,12 @@ public class InMemoryChatHomeService implements ChatHomeService<InMemoryChatRoom
           }
         })
         .toStream()
-        .forEach(chatRoom ->
-        {
-          getChatRoomMapFor(chatRoom).put(chatRoom.getId(), chatRoom);
-        });
+        .forEach(chatroom -> chatrooms[chatroom.getShard()].put(chatroom.getId(), chatroom));
   }
 
-  @Override
-  public Mono<ChatRoom> putChatRoom(ChatRoom chatRoom)
+  public void putChatRoom(ChatRoom chatRoom)
   {
-    getChatRoomMapFor(chatRoom).put(chatRoom.getId(), chatRoom);
-    return Mono.just(chatRoom);
+    chatrooms[chatRoom.getShard()].put(chatRoom.getId(), chatRoom);
   }
 
   @Override
@@ -77,11 +66,4 @@ public class InMemoryChatHomeService implements ChatHomeService<InMemoryChatRoom
   {
     return Flux.fromStream(chatrooms[shard].values().stream());
   }
-
-
-  private Map<UUID, ChatRoom> getChatRoomMapFor(ChatRoom chatRoom)
-  {
-    int shard = shardingStrategy.selectShard(chatRoom.getId());
-    return chatrooms[shard];
-  }
 }