package de.juplo.kafka;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.serialization.StringDeserializer;
+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.time.Clock;
-import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.Optional;
+
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
@Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
public class ApplicationConfiguration
{
@Bean
- public ApplicationRecordHandler recordHandler(AdderResults adderResults)
+ public ApplicationRecordHandler applicationRecordHandler(
+ AdderResults adderResults,
+ KafkaProperties kafkaProperties,
+ ApplicationProperties applicationProperties)
{
- return new ApplicationRecordHandler(adderResults);
+ return new ApplicationRecordHandler(
+ adderResults,
+ Optional.ofNullable(applicationProperties.getThrottle()),
+ kafkaProperties.getClientId());
}
@Bean
ApplicationRecordHandler recordHandler,
AdderResults adderResults,
StateRepository stateRepository,
- Consumer<String, String> consumer,
- ApplicationProperties properties)
+ KafkaProperties kafkaProperties)
{
return new ApplicationRebalanceListener(
recordHandler,
adderResults,
stateRepository,
- properties.getClientId(),
- properties.getTopic(),
- Clock.systemDefaultZone(),
- properties.getCommitInterval(),
- consumer);
+ kafkaProperties.getClientId());
}
@Bean
- public EndlessConsumer<String, String> endlessConsumer(
- KafkaConsumer<String, String> kafkaConsumer,
- ExecutorService executor,
- ApplicationRebalanceListener rebalanceListener,
- ApplicationRecordHandler recordHandler,
- ApplicationProperties properties)
+ public ApplicationErrorHandler applicationErrorHandler()
{
- return
- new EndlessConsumer<>(
- executor,
- properties.getClientId(),
- properties.getTopic(),
- kafkaConsumer,
- rebalanceListener,
- recordHandler);
+ return new ApplicationErrorHandler();
}
@Bean
- public ExecutorService executor()
+ public EndlessConsumer endlessConsumer(
+ RecordHandler recordHandler,
+ ApplicationErrorHandler errorHandler,
+ KafkaProperties kafkaProperties,
+ KafkaListenerEndpointRegistry endpointRegistry)
{
- return Executors.newSingleThreadExecutor();
- }
-
- @Bean(destroyMethod = "close")
- public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
- {
- Properties props = new Properties();
-
- props.put("bootstrap.servers", properties.getBootstrapServer());
- 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("metadata.max.age.ms", "1000");
- props.put("key.deserializer", StringDeserializer.class.getName());
- props.put("value.deserializer", StringDeserializer.class.getName());
-
- return new KafkaConsumer<>(props);
+ return
+ new EndlessConsumer(
+ kafkaProperties.getClientId(),
+ endpointRegistry,
+ errorHandler,
+ recordHandler);
}
}