package de.juplo.kafka;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.serialization.StringDeserializer;
+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 org.springframework.kafka.support.serializer.JsonDeserializer;
-import java.util.Optional;
-import java.util.Properties;
+import org.springframework.kafka.core.ConsumerFactory;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
public class ApplicationConfiguration
{
@Bean
- public ApplicationRecordHandler recordHandler(
- AdderResults adderResults,
- ApplicationProperties properties)
- {
- return new ApplicationRecordHandler(
- adderResults,
- Optional.ofNullable(properties.getThrottle()),
- properties.getClientId());
- }
-
- @Bean
- public AdderResults adderResults()
- {
- return new AdderResults();
- }
-
- @Bean
- public ApplicationRebalanceListener rebalanceListener(
- ApplicationRecordHandler recordHandler,
- AdderResults adderResults,
- StateRepository stateRepository,
- ApplicationProperties properties)
- {
- return new ApplicationRebalanceListener(
- recordHandler,
- adderResults,
- stateRepository,
- properties.getClientId());
- }
-
- @Bean
- public EndlessConsumer<String, Message> endlessConsumer(
- KafkaConsumer<String, Message> kafkaConsumer,
+ public SimpleConsumer endlessConsumer(
+ Consumer<String, Message> kafkaConsumer,
ExecutorService executor,
- ApplicationRebalanceListener rebalanceListener,
- ApplicationRecordHandler recordHandler,
- ApplicationProperties properties)
+ KafkaProperties kafkaProperties,
+ ApplicationProperties applicationProperties)
{
return
- new EndlessConsumer<>(
+ new SimpleConsumer(
executor,
- properties.getClientId(),
- properties.getTopic(),
- kafkaConsumer,
- rebalanceListener,
- recordHandler);
+ kafkaProperties.getClientId(),
+ applicationProperties.getTopic(),
+ kafkaConsumer);
}
@Bean
}
@Bean(destroyMethod = "close")
- public KafkaConsumer<String, Message> kafkaConsumer(ApplicationProperties properties)
+ public Consumer<String, Message> kafkaConsumer(ConsumerFactory<String, Message> factory)
{
- Properties props = new Properties();
-
- props.put("bootstrap.servers", properties.getBootstrapServer());
- props.put("partition.assignment.strategy", "org.apache.kafka.clients.consumer.StickyAssignor");
- props.put("group.id", properties.getGroupId());
- props.put("client.id", properties.getClientId());
- 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("value.deserializer", JsonDeserializer.class.getName());
- props.put(JsonDeserializer.TRUSTED_PACKAGES, "de.juplo.kafka");
- props.put(JsonDeserializer.TYPE_MAPPINGS,
- Message.Type.ADD + ":" + MessageAddNumber.class.getName() + "," +
- Message.Type.CALC + ":" + MessageCalculateSum.class.getName());
-
- return new KafkaConsumer<>(props);
+ return factory.createConsumer();
}
}