projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
`EndlessConsumer` nimmt jetzt einzelne `ConsumerRecord`s entgegen
[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
bae5d51
..
f8bf857
100644
(file)
--- a/
src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@
-1,16
+1,13
@@
package de.juplo.kafka;
package de.juplo.kafka;
-import org.apache.kafka.clients.consumer.Consumer;
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Optional;
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import org.springframework.kafka.core.ConsumerFactory;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
@Configuration
@Configuration
@@
-18,7
+15,7
@@
import java.util.concurrent.Executors;
public class ApplicationConfiguration
{
@Bean
public class ApplicationConfiguration
{
@Bean
- public ApplicationRecordHandler
r
ecordHandler(
+ public ApplicationRecordHandler
applicationR
ecordHandler(
AdderResults adderResults,
KafkaProperties kafkaProperties,
ApplicationProperties applicationProperties)
AdderResults adderResults,
KafkaProperties kafkaProperties,
ApplicationProperties applicationProperties)
@@
-40,8
+37,7
@@
public class ApplicationConfiguration
ApplicationRecordHandler recordHandler,
AdderResults adderResults,
StateRepository stateRepository,
ApplicationRecordHandler recordHandler,
AdderResults adderResults,
StateRepository stateRepository,
- KafkaProperties kafkaProperties,
- ApplicationProperties applicationProperties)
+ KafkaProperties kafkaProperties)
{
return new ApplicationRebalanceListener(
recordHandler,
{
return new ApplicationRebalanceListener(
recordHandler,
@@
-50,34
+46,24
@@
public class ApplicationConfiguration
kafkaProperties.getClientId());
}
kafkaProperties.getClientId());
}
+ @Bean
+ public ApplicationErrorHandler applicationErrorHandler()
+ {
+ return new ApplicationErrorHandler();
+ }
+
@Bean
public EndlessConsumer<String, Message> endlessConsumer(
@Bean
public EndlessConsumer<String, Message> endlessConsumer(
- Consumer<String, Message> kafkaConsumer,
- ExecutorService executor,
- ApplicationRebalanceListener rebalanceListener,
- ApplicationRecordHandler recordHandler,
+ RecordHandler recordHandler,
+ ApplicationErrorHandler errorHandler,
KafkaProperties kafkaProperties,
KafkaProperties kafkaProperties,
-
ApplicationProperties applicationProperties
)
+
KafkaListenerEndpointRegistry endpointRegistry
)
{
return
new EndlessConsumer<>(
{
return
new EndlessConsumer<>(
- executor,
kafkaProperties.getClientId(),
kafkaProperties.getClientId(),
- applicationProperties.getTopic(),
- kafkaConsumer,
- rebalanceListener,
+ endpointRegistry,
+ errorHandler,
recordHandler);
}
recordHandler);
}
-
- @Bean
- public ExecutorService executor()
- {
- return Executors.newSingleThreadExecutor();
- }
-
- @Bean(destroyMethod = "close")
- public Consumer<String, Message> kafkaConsumer(ConsumerFactory<String, Message> factory)
- {
- return factory.createConsumer();
- }
}
}