import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks;
+import java.time.Clock;
import java.time.LocalDateTime;
import java.util.*;
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();
}
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);
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()
public Flux<Message> getMessages(long first, long last)
{
- return chatroomService.getMessages(first, last);
+ return service.getMessages(first, last);
}
private Sinks.Many<Message> createSink()