projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEU
[demos/kafka/chat]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
chat
/
backend
/
persistence
/
kafka
/
ChatMessageChannel.java
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatMessageChannel.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatMessageChannel.java
index
bff38ae
..
7b19bb6
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatMessageChannel.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatMessageChannel.java
@@
-12,25
+12,22
@@
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.errors.RecordDeserializationException;
import org.apache.kafka.common.errors.WakeupException;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.*;
import org.apache.kafka.common.errors.WakeupException;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.Callable;
import java.util.stream.IntStream;
@Slf4j
import java.util.stream.IntStream;
@Slf4j
-public class ChatMessageChannel implements
Runnable
, ConsumerRebalanceListener
+public class ChatMessageChannel implements
Callable<Optional<Exception>>
, ConsumerRebalanceListener
{
private final String topic;
{
private final String topic;
- private final Consumer<String, MessageTo> consumer;
private final Producer<String, MessageTo> producer;
private final Producer<String, MessageTo> producer;
+ private final Consumer<String, MessageTo> consumer;
private final ZoneId zoneId;
private final int numShards;
private final boolean[] isShardOwned;
private final ZoneId zoneId;
private final int numShards;
private final boolean[] isShardOwned;
@@
-46,8
+43,8
@@
public class ChatMessageChannel implements Runnable, ConsumerRebalanceListener
public ChatMessageChannel(
String topic,
public ChatMessageChannel(
String topic,
- Consumer<String, MessageTo> consumer,
Producer<String, MessageTo> producer,
Producer<String, MessageTo> producer,
+ Consumer<String, MessageTo> consumer,
ZoneId zoneId,
int numShards)
{
ZoneId zoneId,
int numShards)
{
@@
-156,7
+153,7
@@
public class ChatMessageChannel implements Runnable, ConsumerRebalanceListener
}
@Override
}
@Override
- public
void run
()
+ public
Optional<Exception> call
()
{
consumer.subscribe(List.of(topic));
{
consumer.subscribe(List.of(topic));
@@
-194,7
+191,15
@@
public class ChatMessageChannel implements Runnable, ConsumerRebalanceListener
log.info("Received WakeupException, exiting!");
running = false;
}
log.info("Received WakeupException, exiting!");
running = false;
}
+ catch (Exception e)
+ {
+ log.error("Exiting abnormally!");
+ return Optional.of(e);
+ }
}
}
+
+ log.info("Exiting normally");
+ return Optional.empty();
}
void loadMessages(ConsumerRecords<String, MessageTo> records)
}
void loadMessages(ConsumerRecords<String, MessageTo> records)
@@
-270,8
+275,12
@@
public class ChatMessageChannel implements Runnable, ConsumerRebalanceListener
return Mono.justOrEmpty(chatrooms[shard].get(id));
}
return Mono.justOrEmpty(chatrooms[shard].get(id));
}
- Flux<ChatRoom> getChatRooms(
int shard
)
+ Flux<ChatRoom> getChatRooms()
{
{
- return Flux.fromStream(chatrooms[shard].values().stream());
+ return Flux.fromStream(IntStream
+ .range(0, numShards)
+ .filter(shard -> isShardOwned[shard])
+ .mapToObj(shard -> Integer.valueOf(shard))
+ .flatMap(shard -> chatrooms[shard].values().stream()));
}
}
}
}