X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatRoom.java;h=b9463095b038e47e3419e4b123b6c51e29db3ea4;hb=3dcdfa896eaecf9802fdc2af4e2bd4951b0f5f6a;hp=02f5c08c3209e5c9bb58a8758cf1414b6a5d50e5;hpb=41e0a7cfd0025d5bea9722c8fc10c3b20a0fcad7;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 02f5c08c..b9463095 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,8 +1,5 @@
 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;
@@ -17,17 +14,9 @@ import java.util.regex.Pattern;
 
 
 @Slf4j
-@EqualsAndHashCode(of = { "id" })
-@ToString(of = { "id", "name" })
-public class ChatRoom
+public class ChatRoom extends ChatRoomInfo
 {
   public final static Pattern VALID_USER = Pattern.compile("^[a-z0-9-]{2,}$");
-  @Getter
-  private final UUID id;
-  @Getter
-  private final String name;
-  @Getter
-  private final int shard;
   private final Clock clock;
   private final ChatRoomService service;
   private final int bufferSize;
@@ -42,10 +31,8 @@ public class ChatRoom
       ChatRoomService service,
       int bufferSize)
   {
+    super(id, name, shard);
     log.info("Created ChatRoom {} with buffer-size {}", id, bufferSize);
-    this.id = id;
-    this.name = name;
-    this.shard = shard;
     this.clock = clock;
     this.service = service;
     this.bufferSize = bufferSize;
@@ -81,7 +68,7 @@ public class ChatRoom
         })
         .switchIfEmpty(
             Mono
-                .fromSupplier(() ->service.persistMessage(key, LocalDateTime.now(clock), text))
+                .defer(() -> service.persistMessage(key, LocalDateTime.now(clock), text))
                 .doOnNext(m ->
                 {
                   Sinks.EmitResult result = sink.tryEmitNext(m);
@@ -93,6 +80,11 @@ public class ChatRoom
   }
 
 
+  public ChatRoomService getChatRoomService()
+  {
+    return service;
+  }
+
   public Mono<Message> getMessage(String username, Long messageId)
   {
     Message.MessageKey key = Message.MessageKey.of(username, messageId);