X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2Fkafka%2FChatRoomChannel.java;h=57deaf2724a5be90199d15d8142dd99ff6adb664;hb=1416ccc8a9eae999201dbf7c77c4d4906fc9fc24;hp=9ea23b13126afa753fc4290e54e7aa6ef7fc40aa;hpb=5c338c58065988f7841c4ab9ee1b193e754da9b9;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 9ea23b13..57deaf27 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
@@ -14,18 +14,16 @@ import reactor.core.publisher.Mono;
 
 import java.time.*;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 
 
 @RequiredArgsConstructor
 @Slf4j
-public class ChatRoomChannel implements Callable<Optional<Exception>>
+public class ChatRoomChannel implements Runnable
 {
   private final String topic;
-  private final Producer<Integer, ChatRoomTo> producer;
-  private final Consumer<Integer, ChatRoomTo> consumer;
+  private final Producer<Integer, CreateChatRoomRequestTo> producer;
+  private final Consumer<Integer, CreateChatRoomRequestTo> consumer;
   private final ShardingStrategy shardingStrategy;
   private final ChatMessageChannel chatMessageChannel;
   private final Clock clock;
@@ -39,21 +37,21 @@ public class ChatRoomChannel implements Callable<Optional<Exception>>
       String name)
   {
     int shard = this.shardingStrategy.selectShard(chatRoomId);
-    ChatRoomTo chatRoomTo = ChatRoomTo.of(chatRoomId, name, shard);
+    CreateChatRoomRequestTo createChatRoomRequestTo = CreateChatRoomRequestTo.of(chatRoomId.toString(), name, shard);
     return Mono.create(sink ->
     {
-      ProducerRecord<Integer, ChatRoomTo> record =
+      ProducerRecord<Integer, CreateChatRoomRequestTo> record =
           new ProducerRecord<>(
               topic,
               shard,
-              chatRoomTo);
+              createChatRoomRequestTo);
 
       producer.send(record, ((metadata, exception) ->
       {
         if (metadata != null)
         {
-          log.info("Successfully send chreate-request for chat room: {}", chatRoomTo);
-          sink.success(chatRoomTo.toChatRoomInfo());
+          log.info("Successfully send chreate-request for chat room: {}", createChatRoomRequestTo);
+          sink.success(createChatRoomRequestTo.toChatRoomInfo());
         }
         else
         {
@@ -70,7 +68,7 @@ public class ChatRoomChannel implements Callable<Optional<Exception>>
   }
 
   @Override
-  public Optional<Exception> call()
+  public void run()
   {
     consumer.assign(List.of(new TopicPartition(topic, 0)));
 
@@ -80,10 +78,10 @@ public class ChatRoomChannel implements Callable<Optional<Exception>>
     {
       try
       {
-        ConsumerRecords<Integer, ChatRoomTo> records = consumer.poll(Duration.ofMinutes(5));
+        ConsumerRecords<Integer, CreateChatRoomRequestTo> records = consumer.poll(Duration.ofMinutes(5));
         log.info("Fetched {} messages", records.count());
 
-        for (ConsumerRecord<Integer, ChatRoomTo> record : records)
+        for (ConsumerRecord<Integer, CreateChatRoomRequestTo> record : records)
         {
           createChatRoom(record.value().toChatRoomInfo());
         }
@@ -93,15 +91,9 @@ public class ChatRoomChannel implements Callable<Optional<Exception>>
         log.info("Received WakeupException, exiting!");
         running = false;
       }
-      catch (Exception e)
-      {
-        log.error("Exiting abnormally!");
-        return Optional.of(e);
-      }
     }
 
     log.info("Exiting normally");
-    return Optional.empty();
   }