X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatRoom.java;h=22eebffde1070643b26b12ac6539a1cf3217bee2;hb=084a922c47f5ecacc7e86c03abd5155fa3255440;hp=0fdea33e5375efb3ed14ab16124a97fa32f57af6;hpb=cfda873368d7b3fdb4869fbce98a0d6e8ca69ab7;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 0fdea33e..22eebffd 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 @@ -1,22 +1,28 @@ package de.juplo.kafka.chat.backend.domain; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.ToString; import lombok.extern.slf4j.Slf4j; 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.*; @Slf4j +@EqualsAndHashCode(of = { "id" }) +@ToString(of = { "id", "name" }) public class ChatRoom { @Getter private final UUID id; @Getter private final String name; + private final Clock clock; private final ChatRoomService service; private final int bufferSize; private Sinks.Many sink; @@ -24,11 +30,13 @@ public class ChatRoom public ChatRoom( UUID id, String name, + Clock clock, ChatRoomService service, int bufferSize) { this.id = id; this.name = name; + this.clock = clock; this.service = service; this.bufferSize = bufferSize; this.sink = createSink(); @@ -37,12 +45,11 @@ public class ChatRoom synchronized public Mono addMessage( Long id, - LocalDateTime timestamp, String user, String text) { return service - .persistMessage(Message.MessageKey.of(user, id), timestamp, text) + .persistMessage(Message.MessageKey.of(user, id), LocalDateTime.now(clock), text) .doOnNext(message -> { Sinks.EmitResult result = sink.tryEmitNext(message);