X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2Fkafka%2FKafkaChatRoomService.java;h=f80223489ae3cd71099ba36cd501aa230ec301bf;hb=28a98bfdbed0cf56697bece5efbe6eb52f331611;hp=4e7eb369b9d8be01a10d96ab97865949e97ebb25;hpb=b4bdcb0fca725eeb32b0215240aa9db18809f7d6;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
index 4e7eb369..f8022348 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
@@ -1,47 +1,25 @@
 package de.juplo.kafka.chat.backend.persistence.kafka;
 
 import de.juplo.kafka.chat.backend.domain.ChatRoomService;
-import de.juplo.kafka.chat.backend.domain.Message;
-import de.juplo.kafka.chat.backend.domain.MessageMutationException;
+import de.juplo.kafka.chat.backend.domain.Message;import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.producer.Producer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.TopicPartition;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.LinkedHashMap;
 import java.util.UUID;
 
 
+@RequiredArgsConstructor
 @Slf4j
 public class KafkaChatRoomService implements ChatRoomService
 {
-  private final Producer<String, MessageTo> producer;
-  private final TopicPartition tp;
+  private final ChatMessageChannel chatMessageChannel;
   private final UUID chatRoomId;
-  private final ZoneOffset zoneOffset;
 
   private final LinkedHashMap<Message.MessageKey, Message> messages = new LinkedHashMap<>();
 
-  private MessageHandlingStrategy strategy;
-
-
-  public KafkaChatRoomService(
-      Producer<String, MessageTo> producer,
-      TopicPartition tp,
-      UUID chatRoomId,
-      ZoneOffset zoneOffset)
-  {
-    this.producer = producer;
-    this.tp = tp;
-    this.chatRoomId = chatRoomId;
-    this.zoneOffset = zoneOffset;
-    this.strategy = new ChatroomInactiveMessageHandlingStrategy(tp);
-  }
-
 
   @Override
   public Mono<Message> persistMessage(
@@ -49,31 +27,14 @@ public class KafkaChatRoomService implements ChatRoomService
     LocalDateTime timestamp,
     String text)
   {
-    return strategy.persistMessage(key, timestamp, text);
+    return chatMessageChannel
+        .sendChatMessage(chatRoomId, key, timestamp, text)
+        .doOnSuccess(message -> persistMessage(message));
   }
 
-  synchronized protected void addMessage(Message message) throws MessageMutationException
+  void persistMessage(Message message)
   {
-    Message existingMessage = messages.get(message.getKey());
-
-    if (existingMessage == null)
-    {
-      messages.put(existingMessage.getKey(), existingMessage);
-    }
-    else
-    {
-      if (!existingMessage.getMessageText().equals(message.getMessageText()))
-      {
-        throw new MessageMutationException(existingMessage, message.getMessageText());
-      }
-
-      // Warn and emit existing message
-      log.warn(
-          "Keeping existing message with {}@{} for {}",
-          existingMessage.getSerialNumber(),
-          existingMessage.getTimestamp(),
-          existingMessage.getKey());
-    }
+    messages.put(message.getKey(), message);
   }
 
   @Override