diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java index e90f57da..f287845b 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java @@ -36,8 +36,8 @@ import org.springframework.context.annotation.Import; * @EnableKafka * public class AppConfig { * @Bean - * public SimpleKafkaListenerContainerFactory myKafkaListenerContainerFactory() { - * SimpleKafkaListenerContainerFactory factory = new SimpleKafkaListenerContainerFactory(); + * public ConcurrentKafkaListenerContainerFactory myKafkaListenerContainerFactory() { + * ConcurrentKafkaListenerContainerFactory factory = new ConcurrentKafkaListenerContainerFactory(); * factory.setConsumerFactory(consumerFactory()); * factory.setConcurrency(4); * return factory; @@ -48,8 +48,8 @@ import org.springframework.context.annotation.Import; * * The {@code KafkaListenerContainerFactory} is responsible to create the listener * container for a particular endpoint. Typical implementations, as the - * {@link org.springframework.kafka.config.SimpleKafkaListenerContainerFactory - * SimpleKafkaListenerContainerFactory} used in the sample above, provides the necessary + * {@link org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory + * ConcurrentKafkaListenerContainerFactory} used in the sample above, provides the necessary * configuration options that are supported by the underlying * {@link org.springframework.kafka.listener.MessageListenerContainer * MessageListenerContainer}. diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/config/ConcurrentKafkaListenerContainerFactory.java similarity index 96% rename from spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java rename to spring-kafka/src/main/java/org/springframework/kafka/config/ConcurrentKafkaListenerContainerFactory.java index a69a33c4..7ed722c5 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/config/ConcurrentKafkaListenerContainerFactory.java @@ -25,11 +25,11 @@ import org.apache.kafka.common.TopicPartition; import org.springframework.kafka.listener.ConcurrentMessageListenerContainer; /** - * A {@link KafkaListenerContainerFactory} implementation to build a regular + * A {@link KafkaListenerContainerFactory} implementation to build a * {@link ConcurrentMessageListenerContainer}. *

* This should be the default for most users and a good transition paths - * for those that are used to build such container definition manually. + * for those that are used to build such container definitions manually. * * @param the key type. * @param the value type. @@ -39,7 +39,7 @@ import org.springframework.kafka.listener.ConcurrentMessageListenerContainer; * @author Artem Bilan * @author Murali Reddy */ -public class SimpleKafkaListenerContainerFactory +public class ConcurrentKafkaListenerContainerFactory extends AbstractKafkaListenerContainerFactory, K, V> { private Integer concurrency; diff --git a/spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java index f57f157a..16eb3cdd 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java @@ -36,9 +36,9 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; import org.springframework.kafka.config.KafkaListenerContainerFactory; import org.springframework.kafka.config.KafkaListenerEndpointRegistry; -import org.springframework.kafka.config.SimpleKafkaListenerContainerFactory; import org.springframework.kafka.core.ConsumerFactory; import org.springframework.kafka.core.DefaultKafkaConsumerFactory; import org.springframework.kafka.core.DefaultKafkaProducerFactory; @@ -192,7 +192,8 @@ public class EnableKafkaIntegrationTests { @Bean public KafkaListenerContainerFactory> kafkaListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory()); return factory; } @@ -200,7 +201,8 @@ public class EnableKafkaIntegrationTests { @Bean public KafkaListenerContainerFactory> kafkaJsonListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory()); factory.setMessageConverter(new StringJsonMessageConverter()); return factory; @@ -209,7 +211,8 @@ public class EnableKafkaIntegrationTests { @Bean public KafkaListenerContainerFactory> kafkaManualAckListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(manualConsumerFactory()); factory.setAckMode(AckMode.MANUAL_IMMEDIATE); return factory; @@ -218,7 +221,8 @@ public class EnableKafkaIntegrationTests { @Bean public KafkaListenerContainerFactory> kafkaAutoStartFalseListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory()); factory.setAutoStartup(false); factory.setSyncCommits(false); @@ -230,7 +234,8 @@ public class EnableKafkaIntegrationTests { @Bean public KafkaListenerContainerFactory> kafkaRebalanceListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory()); factory.setConsumerRebalanceListener(consumerRebalanceListener()); return factory; diff --git a/src/reference/asciidoc/kafka.adoc b/src/reference/asciidoc/kafka.adoc index f6297b5c..a4de6443 100644 --- a/src/reference/asciidoc/kafka.adoc +++ b/src/reference/asciidoc/kafka.adoc @@ -267,8 +267,8 @@ This mechanism requires a listener container factory, which is used to configure @Bean KafkaListenerContainerFactory> kafkaListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = - new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory()); factory.setConcurrency(3); return factory; diff --git a/src/reference/asciidoc/quick-tour.adoc b/src/reference/asciidoc/quick-tour.adoc index 602bd27b..93152650 100644 --- a/src/reference/asciidoc/quick-tour.adoc +++ b/src/reference/asciidoc/quick-tour.adoc @@ -136,10 +136,10 @@ public void testSimple() throws Exception { public class Config { @Bean - SimpleKafkaListenerContainerFactory + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory() { - SimpleKafkaListenerContainerFactory factory = - new SimpleKafkaListenerContainerFactory<>(); + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory()); return factory; }