X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatRoom.java;h=63b5b36391a80447cbbe184e126cfcbec155cee1;hb=9de7f5dd0a6cd0205a9540fac141614af57ae8f4;hp=bed91c76c3daf1960901cc05ddc7015b3498cf64;hpb=a35ac0e02622cb5638380612064467c2309ebee5;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
index bed91c76..63b5b363 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
@@ -6,6 +6,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
 
+import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -17,19 +18,22 @@ public class ChatRoom
   private final UUID id;
   @Getter
   private final String name;
-  private final ChatroomService chatroomService;
+  private final Clock clock;
+  private final ChatRoomService service;
   private final int bufferSize;
   private Sinks.Many<Message> sink;
 
   public ChatRoom(
       UUID id,
       String name,
-      ChatroomService chatroomService,
+      Clock clock,
+      ChatRoomService service,
       int bufferSize)
   {
     this.id = id;
     this.name = name;
-    this.chatroomService = chatroomService;
+    this.clock = clock;
+    this.service = service;
     this.bufferSize = bufferSize;
     this.sink = createSink();
   }
@@ -37,12 +41,11 @@ public class ChatRoom
 
   synchronized public Mono<Message> addMessage(
       Long id,
-      LocalDateTime timestamp,
       String user,
       String text)
   {
-    return chatroomService
-        .persistMessage(Message.MessageKey.of(user, id), timestamp, text)
+    return service
+        .persistMessage(Message.MessageKey.of(user, id), LocalDateTime.now(clock), text)
         .doOnNext(message ->
         {
           Sinks.EmitResult result = sink.tryEmitNext(message);
@@ -57,7 +60,7 @@ public class ChatRoom
   public Mono<Message> getMessage(String username, Long messageId)
   {
     Message.MessageKey key = Message.MessageKey.of(username, messageId);
-    return chatroomService.getMessage(key);
+    return service.getMessage(key);
   }
 
   synchronized public Flux<Message> listen()
@@ -74,7 +77,7 @@ public class ChatRoom
 
   public Flux<Message> getMessages(long first, long last)
   {
-    return chatroomService.getMessages(first, last);
+    return service.getMessages(first, last);
   }
 
   private Sinks.Many<Message> createSink()