projects
/
demos
/
kafka
/
chat
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4cf9f87
)
NEU
author
Kai Moritz
<kai@juplo.de>
Thu, 20 Apr 2023 15:10:57 +0000
(17:10 +0200)
committer
Kai Moritz
<kai@juplo.de>
Thu, 20 Apr 2023 15:10:57 +0000
(17:10 +0200)
src/main/java/de/juplo/kafka/chat/backend/ChatBackendProperties.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/chat/backend/KafkaConfigurationIT.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaServicesConfiguration.java
patch
|
blob
|
history
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendProperties.java
b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendProperties.java
index
cb5684c
..
da58b53
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/ChatBackendProperties.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/ChatBackendProperties.java
@@
-36,7
+36,8
@@
public class ChatBackendProperties
{
private String clientIdPrefix;
private String bootstrapServers = ":9092";
{
private String clientIdPrefix;
private String bootstrapServers = ":9092";
- private String topic = "test";
+ private String chatroomChannelTopic = "chatroom_channel";
+ private String messageChannelTopic = "message_channel";
private int numPartitions = 2;
}
private int numPartitions = 2;
}
diff --git
a/src/test/java/de/juplo/kafka/chat/backend/KafkaConfigurationIT.java
b/src/test/java/de/juplo/kafka/chat/backend/KafkaConfigurationIT.java
index
094db39
..
fc2b7c8
100644
(file)
--- a/
src/test/java/de/juplo/kafka/chat/backend/KafkaConfigurationIT.java
+++ b/
src/test/java/de/juplo/kafka/chat/backend/KafkaConfigurationIT.java
@@
-20,14
+20,14
@@
import static de.juplo.kafka.chat.backend.KafkaConfigurationIT.MESSAGES_TOPIC;
"chat.backend.kafka.client-id-PREFIX=TEST",
"chat.backend.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
"chat.backend.kafka.client-id-PREFIX=TEST",
"chat.backend.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
- "chat.backend.kafka.chatroom
s
-topic=" + CHATROOMS_TOPIC,
- "chat.backend.kafka.message
s
-topic=" + MESSAGES_TOPIC,
+ "chat.backend.kafka.chatroom
-channel
-topic=" + CHATROOMS_TOPIC,
+ "chat.backend.kafka.message
-channel
-topic=" + MESSAGES_TOPIC,
"chat.backend.kafka.num-partitions=3" })
@EmbeddedKafka(topics = { CHATROOMS_TOPIC, MESSAGES_TOPIC }, partitions = 3)
class KafkaConfigurationIT extends AbstractConfigurationIT
{
"chat.backend.kafka.num-partitions=3" })
@EmbeddedKafka(topics = { CHATROOMS_TOPIC, MESSAGES_TOPIC }, partitions = 3)
class KafkaConfigurationIT extends AbstractConfigurationIT
{
- final static String CHATROOMS_TOPIC = "TEST_CHAT
_ROOMS
";
- final static String MESSAGES_TOPIC = "TEST_
CHAT_MESSAGES
";
+ final static String CHATROOMS_TOPIC = "TEST_CHAT
ROOM_CHANNEL
";
+ final static String MESSAGES_TOPIC = "TEST_
MESSAGE_CHANNEL
";
@BeforeAll
public static void test(
@BeforeAll
public static void test(
diff --git
a/src/test/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaServicesConfiguration.java
b/src/test/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaServicesConfiguration.java
index
a3dddb1
..
4350779
100644
(file)
--- a/
src/test/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaServicesConfiguration.java
+++ b/
src/test/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaServicesConfiguration.java
@@
-58,7
+58,7
@@
public class KafkaServicesConfiguration
Clock clock)
{
return new ChatRoomChannel(
Clock clock)
{
return new ChatRoomChannel(
- properties.getKafka().getTopic(),
+ properties.getKafka().get
ChatroomChannel
Topic(),
chatRoomChannelProducer,
chatRoomChannelConsumer,
shardingStrategy,
chatRoomChannelProducer,
chatRoomChannelConsumer,
shardingStrategy,
@@
-155,7
+155,7
@@
public class KafkaServicesConfiguration
ZoneId zoneId)
{
return new ChatMessageChannel(
ZoneId zoneId)
{
return new ChatMessageChannel(
- properties.getKafka().getTopic(),
+ properties.getKafka().get
MessageChannel
Topic(),
chatMessageChannelProducer,
chatMessageChannelConsumer,
zoneId,
chatMessageChannelProducer,
chatMessageChannelConsumer,
zoneId,