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
/
test
/
java
/
de
/
juplo
/
kafka
/
chat
/
backend
/
persistence
/
kafka
/
KafkaServicesConfiguration.java
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
b7eb711
..
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
@@
-22,6
+22,8
@@
import org.springframework.kafka.support.serializer.JsonSerializer;
import java.time.Clock;
import java.time.ZoneId;
import java.time.Clock;
import java.time.ZoneId;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import java.util.Properties;
@@
-56,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,
@@
-68,11
+70,17
@@
public class KafkaServicesConfiguration
@Bean
Producer<Integer, ChatRoomTo> chatRoomChannelProducer(
Properties defaultProducerProperties,
@Bean
Producer<Integer, ChatRoomTo> chatRoomChannelProducer(
Properties defaultProducerProperties,
+ ChatBackendProperties chatBackendProperties,
IntegerSerializer integerSerializer,
JsonSerializer<ChatRoomTo> chatRoomSerializer)
{
IntegerSerializer integerSerializer,
JsonSerializer<ChatRoomTo> chatRoomSerializer)
{
+ Map<String, Object> properties = new HashMap<>();
+ defaultProducerProperties.forEach((key, value) -> properties.put(key.toString(), value));
+ properties.put(
+ ProducerConfig.CLIENT_ID_CONFIG,
+ chatBackendProperties.getKafka().getClientIdPrefix() + "_CHATROOM_CHANNEL_PRODUCER");
return new KafkaProducer<>(
return new KafkaProducer<>(
-
defaultProducerP
roperties,
+
p
roperties,
integerSerializer,
chatRoomSerializer);
}
integerSerializer,
chatRoomSerializer);
}
@@
-87,17
+95,25
@@
public class KafkaServicesConfiguration
JsonSerializer<ChatRoomTo> chatRoomSerializer()
{
JsonSerializer<ChatRoomTo> serializer = new JsonSerializer<>();
JsonSerializer<ChatRoomTo> chatRoomSerializer()
{
JsonSerializer<ChatRoomTo> serializer = new JsonSerializer<>();
+ serializer.configure(
+ Map.of(JsonSerializer.ADD_TYPE_INFO_HEADERS, false),
+ false);
return serializer;
}
@Bean
Consumer<Integer, ChatRoomTo> chatRoomChannelConsumer(
Properties defaultConsumerProperties,
return serializer;
}
@Bean
Consumer<Integer, ChatRoomTo> chatRoomChannelConsumer(
Properties defaultConsumerProperties,
+ ChatBackendProperties chatBackendProperties,
IntegerDeserializer integerDeserializer,
JsonDeserializer<ChatRoomTo> chatRoomDeserializer)
{
IntegerDeserializer integerDeserializer,
JsonDeserializer<ChatRoomTo> chatRoomDeserializer)
{
- Properties properties = new Properties(defaultConsumerProperties);
- properties.setProperty(
+ Map<String, Object> properties = new HashMap<>();
+ defaultConsumerProperties.forEach((key, value) -> properties.put(key.toString(), value));
+ properties.put(
+ ConsumerConfig.CLIENT_ID_CONFIG,
+ chatBackendProperties.getKafka().getClientIdPrefix() + "_CHATROOM_CHANNEL_CONSUMER");
+ properties.put(
ConsumerConfig.GROUP_ID_CONFIG,
"chat_room_channel");
return new KafkaConsumer<>(
ConsumerConfig.GROUP_ID_CONFIG,
"chat_room_channel");
return new KafkaConsumer<>(
@@
-116,6
+132,12
@@
public class KafkaServicesConfiguration
JsonDeserializer<ChatRoomTo> chatRoomDeserializer()
{
JsonDeserializer<ChatRoomTo> deserializer = new JsonDeserializer<>();
JsonDeserializer<ChatRoomTo> chatRoomDeserializer()
{
JsonDeserializer<ChatRoomTo> deserializer = new JsonDeserializer<>();
+ deserializer.configure(
+ Map.of(
+ JsonDeserializer.USE_TYPE_INFO_HEADERS, false,
+ JsonDeserializer.VALUE_DEFAULT_TYPE, ChatRoomTo.class,
+ JsonDeserializer.TRUSTED_PACKAGES, getClass().getPackageName()),
+ false );
return deserializer;
}
return deserializer;
}
@@
-133,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,
@@
-143,11
+165,17
@@
public class KafkaServicesConfiguration
@Bean
Producer<String, MessageTo> chatMessageChannelProducer(
Properties defaultProducerProperties,
@Bean
Producer<String, MessageTo> chatMessageChannelProducer(
Properties defaultProducerProperties,
+ ChatBackendProperties chatBackendProperties,
StringSerializer stringSerializer,
JsonSerializer<MessageTo> messageSerializer)
{
StringSerializer stringSerializer,
JsonSerializer<MessageTo> messageSerializer)
{
+ Map<String, Object> properties = new HashMap<>();
+ defaultProducerProperties.forEach((key, value) -> properties.put(key.toString(), value));
+ properties.put(
+ ProducerConfig.CLIENT_ID_CONFIG,
+ chatBackendProperties.getKafka().getClientIdPrefix() + "_MESSAGE_CHANNEL_PRODUCER");
return new KafkaProducer<>(
return new KafkaProducer<>(
-
defaultProducerP
roperties,
+
p
roperties,
stringSerializer,
messageSerializer);
}
stringSerializer,
messageSerializer);
}
@@
-162,17
+190,25
@@
public class KafkaServicesConfiguration
JsonSerializer<MessageTo> chatMessageSerializer()
{
JsonSerializer<MessageTo> serializer = new JsonSerializer<>();
JsonSerializer<MessageTo> chatMessageSerializer()
{
JsonSerializer<MessageTo> serializer = new JsonSerializer<>();
+ serializer.configure(
+ Map.of(JsonSerializer.ADD_TYPE_INFO_HEADERS, false),
+ false);
return serializer;
}
@Bean
Consumer<String, MessageTo> chatMessageChannelConsumer(
Properties defaultConsumerProperties,
return serializer;
}
@Bean
Consumer<String, MessageTo> chatMessageChannelConsumer(
Properties defaultConsumerProperties,
+ ChatBackendProperties chatBackendProperties,
StringDeserializer stringDeserializer,
JsonDeserializer<MessageTo> messageDeserializer)
{
StringDeserializer stringDeserializer,
JsonDeserializer<MessageTo> messageDeserializer)
{
- Properties properties = new Properties(defaultConsumerProperties);
- properties.setProperty(
+ Map<String, Object> properties = new HashMap<>();
+ defaultConsumerProperties.forEach((key, value) -> properties.put(key.toString(), value));
+ properties.put(
+ ConsumerConfig.CLIENT_ID_CONFIG,
+ chatBackendProperties.getKafka().getClientIdPrefix() + "_MESSAGE_CHANNEL_CONSUMER");
+ properties.put(
ConsumerConfig.GROUP_ID_CONFIG,
"chat_message_channel");
return new KafkaConsumer<>(
ConsumerConfig.GROUP_ID_CONFIG,
"chat_message_channel");
return new KafkaConsumer<>(
@@
-191,6
+227,12
@@
public class KafkaServicesConfiguration
JsonDeserializer<MessageTo> chatMessageDeserializer()
{
JsonDeserializer<MessageTo> deserializer = new JsonDeserializer<>();
JsonDeserializer<MessageTo> chatMessageDeserializer()
{
JsonDeserializer<MessageTo> deserializer = new JsonDeserializer<>();
+ deserializer.configure(
+ Map.of(
+ JsonDeserializer.USE_TYPE_INFO_HEADERS, false,
+ JsonDeserializer.VALUE_DEFAULT_TYPE, MessageTo.class,
+ JsonDeserializer.TRUSTED_PACKAGES, getClass().getPackageName()),
+ false );
return deserializer;
}
return deserializer;
}
@@
-198,9
+240,6
@@
public class KafkaServicesConfiguration
Properties defaultProducerProperties(ChatBackendProperties chatBackendProperties)
{
Properties properties = new Properties();
Properties defaultProducerProperties(ChatBackendProperties chatBackendProperties)
{
Properties properties = new Properties();
- properties.setProperty(
- ProducerConfig.CLIENT_ID_CONFIG,
- chatBackendProperties.getKafka().getClientId());
properties.setProperty(
ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
chatBackendProperties.getKafka().getBootstrapServers());
properties.setProperty(
ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
chatBackendProperties.getKafka().getBootstrapServers());
@@
-214,9
+253,6
@@
public class KafkaServicesConfiguration
properties.setProperty(
ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
chatBackendProperties.getKafka().getBootstrapServers());
properties.setProperty(
ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
chatBackendProperties.getKafka().getBootstrapServers());
- properties.setProperty(
- ConsumerConfig.CLIENT_ID_CONFIG,
- chatBackendProperties.getKafka().getClientId());
properties.setProperty(
ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG,
"false");
properties.setProperty(
ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG,
"false");