X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2Fkafka%2FChatRoomChannel.java;h=1c6ae915c7cf4970874ff5b89a32e4242d6ec2a1;hb=f5c4bff6a6103d0415c8b2ac9e4ab7517c04c215;hp=57deaf2724a5be90199d15d8142dd99ff6adb664;hpb=1416ccc8a9eae999201dbf7c77c4d4906fc9fc24;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
index 57deaf27..1c6ae915 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
@@ -10,11 +10,15 @@ import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.WakeupException;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.*;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.IntStream;
 
 
 @RequiredArgsConstructor
@@ -22,51 +26,12 @@ import java.util.UUID;
 public class ChatRoomChannel implements Runnable
 {
   private final String topic;
-  private final Producer<Integer, CreateChatRoomRequestTo> producer;
-  private final Consumer<Integer, CreateChatRoomRequestTo> consumer;
-  private final ShardingStrategy shardingStrategy;
-  private final ChatMessageChannel chatMessageChannel;
-  private final Clock clock;
-  private final int bufferSize;
+  private final Consumer<String, AbstractTo> consumer;
+  private final Map<UUID, ChatRoomInfo> chatrooms = new HashMap<>();
 
   private boolean running;
 
 
-  Mono<ChatRoomInfo> sendCreateChatRoomRequest(
-      UUID chatRoomId,
-      String name)
-  {
-    int shard = this.shardingStrategy.selectShard(chatRoomId);
-    CreateChatRoomRequestTo createChatRoomRequestTo = CreateChatRoomRequestTo.of(chatRoomId.toString(), name, shard);
-    return Mono.create(sink ->
-    {
-      ProducerRecord<Integer, CreateChatRoomRequestTo> record =
-          new ProducerRecord<>(
-              topic,
-              shard,
-              createChatRoomRequestTo);
-
-      producer.send(record, ((metadata, exception) ->
-      {
-        if (metadata != null)
-        {
-          log.info("Successfully send chreate-request for chat room: {}", createChatRoomRequestTo);
-          sink.success(createChatRoomRequestTo.toChatRoomInfo());
-        }
-        else
-        {
-          // On send-failure
-          log.error(
-              "Could not send create-request for chat room (id={}, name={}): {}",
-              chatRoomId,
-              name,
-              exception);
-          sink.error(exception);
-        }
-      }));
-    });
-  }
-
   @Override
   public void run()
   {
@@ -78,12 +43,24 @@ public class ChatRoomChannel implements Runnable
     {
       try
       {
-        ConsumerRecords<Integer, CreateChatRoomRequestTo> records = consumer.poll(Duration.ofMinutes(5));
+        ConsumerRecords<String, AbstractTo> records = consumer.poll(Duration.ofMinutes(5));
         log.info("Fetched {} messages", records.count());
 
-        for (ConsumerRecord<Integer, CreateChatRoomRequestTo> record : records)
+        for (ConsumerRecord<String, AbstractTo> record : records)
         {
-          createChatRoom(record.value().toChatRoomInfo());
+          switch (record.value().getType())
+          {
+            case CHATROOM_INFO:
+              createChatRoom((ChatRoomInfoTo) record.value());
+              break;
+
+            default:
+              log.debug(
+                  "Ignoring message for key {} with offset {}: {}",
+                  record.key(),
+                  record.offset(),
+                  record.value());
+          }
         }
       }
       catch (WakeupException e)
@@ -97,14 +74,14 @@ public class ChatRoomChannel implements Runnable
   }
 
 
-  void createChatRoom(ChatRoomInfo chatRoomInfo)
+  void createChatRoom(ChatRoomInfoTo chatRoomInfoTo)
+  {
+    ChatRoomInfo chatRoomInfo = chatRoomInfoTo.toChatRoomInfo();
+    chatrooms.put(chatRoomInfo.getId(), chatRoomInfo);
+  }
+
+  Flux<ChatRoomInfo> getChatRooms()
   {
-    UUID id = chatRoomInfo.getId();
-    String name = chatRoomInfo.getName();
-    int shard = chatRoomInfo.getShard();
-    log.info("Creating ChatRoom {} with buffer-size {}", id, bufferSize);
-    KafkaChatRoomService service = new KafkaChatRoomService(chatMessageChannel, id);
-    ChatRoom chatRoom = new ChatRoom(id, name, shard, clock, service, bufferSize);
-    chatMessageChannel.putChatRoom(chatRoom);
+    return Flux.fromIterable(chatrooms.values());
   }
 }