-package de.juplo.kafka.chatroom.domain;
+package de.juplo.kafka.chat.backend.domain;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Value;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.util.*;
-import java.util.stream.Stream;
@RequiredArgsConstructor
private final UUID id;
@Getter
private final String name;
- private final LinkedHashMap<MessageKey, Message> messages = new LinkedHashMap<>();
+ private final LinkedHashMap<Message.MessageKey, Message> messages = new LinkedHashMap<>();
private final Sinks.Many<Message> sink = Sinks.many().multicast().onBackpressureBuffer();
synchronized public Mono<Message> addMessage(
String user,
String text)
{
- Message message = new Message(id, (long)messages.size(), timestamp, user, text);
+ Message.MessageKey key = Message.MessageKey.of(user, id);
+ Message message = new Message(key, (long)messages.size(), timestamp, text);
- MessageKey key = new MessageKey(user, id);
Message existing = messages.get(key);
if (existing != null)
{
{
return Mono.fromSupplier(() ->
{
- MessageKey key = MessageKey.of(username, messageId);
+ Message.MessageKey key = Message.MessageKey.of(username, messageId);
return messages.get(key);
});
}
return sink.asFlux();
}
- public Stream<Message> getMessages(long firstMessage)
+ public Flux<Message> getMessages(long first, long last)
{
- return messages
+ return Flux.fromStream(messages
.values()
.stream()
- .filter(message -> message.getSerialNumber() >= firstMessage);
- }
-
-
- @Value(staticConstructor = "of")
- static class MessageKey
- {
- String username;
- Long messageId;
+ .filter(message ->
+ {
+ long serial = message.getSerialNumber();
+ return serial >= first && serial <= last;
+ }));
}
}