Merge branch '2.6.x' into 2.7.x

Closes gh-32773
pull/32861/head
Phillip Webb 2 years ago
commit fbd416adc6

@ -86,13 +86,13 @@ public class KafkaAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(ProducerListener.class) @ConditionalOnMissingBean(ProducerListener.class)
public ProducerListener<Object, Object> kafkaProducerListener() { public LoggingProducerListener<Object, Object> kafkaProducerListener() {
return new LoggingProducerListener<>(); return new LoggingProducerListener<>();
} }
@Bean @Bean
@ConditionalOnMissingBean(ConsumerFactory.class) @ConditionalOnMissingBean(ConsumerFactory.class)
public ConsumerFactory<?, ?> kafkaConsumerFactory( public DefaultKafkaConsumerFactory<?, ?> kafkaConsumerFactory(
ObjectProvider<DefaultKafkaConsumerFactoryCustomizer> customizers) { ObjectProvider<DefaultKafkaConsumerFactoryCustomizer> customizers) {
DefaultKafkaConsumerFactory<Object, Object> factory = new DefaultKafkaConsumerFactory<>( DefaultKafkaConsumerFactory<Object, Object> factory = new DefaultKafkaConsumerFactory<>(
this.properties.buildConsumerProperties()); this.properties.buildConsumerProperties());
@ -102,7 +102,7 @@ public class KafkaAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(ProducerFactory.class) @ConditionalOnMissingBean(ProducerFactory.class)
public ProducerFactory<?, ?> kafkaProducerFactory( public DefaultKafkaProducerFactory<?, ?> kafkaProducerFactory(
ObjectProvider<DefaultKafkaProducerFactoryCustomizer> customizers) { ObjectProvider<DefaultKafkaProducerFactoryCustomizer> customizers) {
DefaultKafkaProducerFactory<?, ?> factory = new DefaultKafkaProducerFactory<>( DefaultKafkaProducerFactory<?, ?> factory = new DefaultKafkaProducerFactory<>(
this.properties.buildProducerProperties()); this.properties.buildProducerProperties());

Loading…
Cancel
Save