projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verbesserungen aus 'stored-offsets' nach 'stored-state' gemerged
[demos/kafka/training]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
ApplicationConfiguration.java
diff --git
a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
index
0d17823
..
1ea90a2
100644
(file)
--- a/
src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@
-1,7
+1,7
@@
package de.juplo.kafka;
package de.juplo.kafka;
-import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.LongDeserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@
-18,39
+18,31
@@
import java.util.concurrent.Executors;
public class ApplicationConfiguration
{
@Bean
public class ApplicationConfiguration
{
@Bean
- public WordcountRecordHandler wordcountRecordHandler(
- PartitionStatisticsRepository repository,
- Consumer<String, String> consumer,
- ApplicationProperties properties)
+ public KeyCountingRecordHandler keyCountingRecordHandler()
{
{
- return new WordcountRecordHandler(
- repository,
- properties.getTopic(),
- Clock.systemDefaultZone(),
- properties.getCommitInterval(),
- consumer);
+ return new KeyCountingRecordHandler();
}
@Bean
}
@Bean
- public
WordcountRebalanceListener wordcount
RebalanceListener(
-
WordcountRecordHandler wordcount
RecordHandler,
+ public
KeyCountingRebalanceListener keyCounting
RebalanceListener(
+
KeyCountingRecordHandler keyCounting
RecordHandler,
PartitionStatisticsRepository repository,
PartitionStatisticsRepository repository,
- Consumer<String, String> consumer,
ApplicationProperties properties)
{
ApplicationProperties properties)
{
- return new
Wordcount
RebalanceListener(
-
wordcount
RecordHandler,
+ return new
KeyCounting
RebalanceListener(
+
keyCounting
RecordHandler,
repository,
properties.getClientId(),
repository,
properties.getClientId(),
- consumer);
+ Clock.systemDefaultZone(),
+ properties.getCommitInterval());
}
@Bean
}
@Bean
- public EndlessConsumer<String,
Stri
ng> endlessConsumer(
- KafkaConsumer<String,
Stri
ng> kafkaConsumer,
+ public EndlessConsumer<String,
Lo
ng> endlessConsumer(
+ KafkaConsumer<String,
Lo
ng> kafkaConsumer,
ExecutorService executor,
ExecutorService executor,
-
WordcountRebalanceListener wordcount
RebalanceListener,
-
WordcountRecordHandler wordcount
RecordHandler,
+
KeyCountingRebalanceListener keyCounting
RebalanceListener,
+
KeyCountingRecordHandler keyCounting
RecordHandler,
ApplicationProperties properties)
{
return
ApplicationProperties properties)
{
return
@@
-59,8
+51,8
@@
public class ApplicationConfiguration
properties.getClientId(),
properties.getTopic(),
kafkaConsumer,
properties.getClientId(),
properties.getTopic(),
kafkaConsumer,
-
wordcount
RebalanceListener,
-
wordcount
RecordHandler);
+
keyCounting
RebalanceListener,
+
keyCounting
RecordHandler);
}
@Bean
}
@Bean
@@
-70,7
+62,7
@@
public class ApplicationConfiguration
}
@Bean(destroyMethod = "close")
}
@Bean(destroyMethod = "close")
- public KafkaConsumer<String,
Stri
ng> kafkaConsumer(ApplicationProperties properties)
+ public KafkaConsumer<String,
Lo
ng> kafkaConsumer(ApplicationProperties properties)
{
Properties props = new Properties();
{
Properties props = new Properties();
@@
-78,11
+70,11
@@
public class ApplicationConfiguration
props.put("partition.assignment.strategy", "org.apache.kafka.clients.consumer.CooperativeStickyAssignor");
props.put("group.id", properties.getGroupId());
props.put("client.id", properties.getClientId());
props.put("partition.assignment.strategy", "org.apache.kafka.clients.consumer.CooperativeStickyAssignor");
props.put("group.id", properties.getGroupId());
props.put("client.id", properties.getClientId());
- props.put("enable.auto.commit", false);
props.put("auto.offset.reset", properties.getAutoOffsetReset());
props.put("auto.offset.reset", properties.getAutoOffsetReset());
+ props.put("auto.commit.interval.ms", (int)properties.getCommitInterval().toMillis());
props.put("metadata.max.age.ms", "1000");
props.put("key.deserializer", StringDeserializer.class.getName());
props.put("metadata.max.age.ms", "1000");
props.put("key.deserializer", StringDeserializer.class.getName());
- props.put("value.deserializer",
Stri
ngDeserializer.class.getName());
+ props.put("value.deserializer",
Lo
ngDeserializer.class.getName());
return new KafkaConsumer<>(props);
}
return new KafkaConsumer<>(props);
}