import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import java.util.Optional;
import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.scheduling.annotation.EnableAsync;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.Executor;
@Configuration
+@EnableAsync
@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
public class ApplicationConfiguration
{
@Bean
- public ApplicationRecordHandler applicationRecordHandler(
- AdderResults adderResults,
- KafkaProperties kafkaProperties,
- ApplicationProperties applicationProperties)
- {
- return new ApplicationRecordHandler(
- adderResults,
- Optional.ofNullable(applicationProperties.getThrottle()),
- kafkaProperties.getClientId());
- }
-
- @Bean
- public AdderResults adderResults()
- {
- return new AdderResults();
- }
-
- @Bean
- public ApplicationRebalanceListener rebalanceListener(
- ApplicationRecordHandler recordHandler,
- AdderResults adderResults,
- StateRepository stateRepository,
- KafkaProperties kafkaProperties)
- {
- return new ApplicationRebalanceListener(
- recordHandler,
- adderResults,
- stateRepository,
- kafkaProperties.getClientId());
- }
-
- @Bean
- public EndlessConsumer<String, Message> endlessConsumer(
- Consumer<String, Message> kafkaConsumer,
- ExecutorService executor,
- ApplicationRebalanceListener rebalanceListener,
- RecordHandler recordHandler,
+ public SimpleConsumer endlessConsumer(
+ Consumer<String, String> kafkaConsumer,
KafkaProperties kafkaProperties,
ApplicationProperties applicationProperties)
{
return
- new EndlessConsumer<>(
- executor,
+ new SimpleConsumer(
kafkaProperties.getClientId(),
applicationProperties.getTopic(),
- kafkaConsumer,
- rebalanceListener,
- recordHandler);
- }
-
- @Bean
- public ExecutorService executor()
- {
- return Executors.newSingleThreadExecutor();
+ kafkaConsumer);
}
@Bean(destroyMethod = "close")
- public Consumer<String, Message> kafkaConsumer(ConsumerFactory<String, Message> factory)
+ public Consumer<?, ?> kafkaConsumer(ConsumerFactory<?, ?> factory)
{
return factory.createConsumer();
}