Note: for fixed backoffs, when this is configured as - * {@link SameIntervalTopicReuseStrategy#SINGLE_TOPIC}, it has precedence over - * the configuration in {@link #fixedDelayTopicStrategy()}. * @return the strategy. * @since 3.0.4 */ diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java index 034cb62e71..95f10a0fda 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java @@ -226,8 +226,7 @@ public void setReplyTemplate(KafkaTemplate replyTemplate) { /** * Set the {@link CommonErrorHandler} which can handle errors for both record and - * batch listeners. Replaces the use of - * {@link org.springframework.kafka.listener.GenericErrorHandler}s. + * batch listeners. * @param commonErrorHandler the handler. * @since 2.8 */ diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/StreamsBuilderFactoryBean.java b/spring-kafka/src/main/java/org/springframework/kafka/config/StreamsBuilderFactoryBean.java index 97a832dc1e..8af071268a 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/config/StreamsBuilderFactoryBean.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/config/StreamsBuilderFactoryBean.java @@ -193,8 +193,7 @@ public void setStateListener(KafkaStreams.StateListener stateListener) { } /** - * Set a {@link StreamsUncaughtExceptionHandler}. Supersedes - * {@link #setUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler)}. + * Set a {@link StreamsUncaughtExceptionHandler}. * @param streamsUncaughtExceptionHandler the handler. * @since 2.8 */ diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java index 1ad004c3f9..8bd3ff82f3 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java @@ -234,7 +234,7 @@ public CommonErrorHandler getCommonErrorHandler() { /** * Set the {@link CommonErrorHandler} which can handle errors for both record - * and batch listeners. Replaces the use of {@link GenericErrorHandler}s. + * and batch listeners. * @param commonErrorHandler the handler. * @since 2.8 */ diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonErrorHandler.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonErrorHandler.java index 2bb383f416..9e305cd73b 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonErrorHandler.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonErrorHandler.java @@ -30,8 +30,7 @@ import org.springframework.kafka.support.TopicPartitionOffset; /** - * Replacement for {@link ErrorHandler} and {@link BatchErrorHandler} and their - * sub-interfaces. + * Listener container error handling contract. * * @author Gary Russell * @since 2.8 diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java index 67862c6b23..ee36e44465 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java @@ -2716,8 +2716,7 @@ private void pauseForNackSleep() { /** * Actually invoke the listener. * @param cRecord the record. - * @param iterator the {@link ConsumerRecords} iterator - used only if a - * {@link RemainingRecordsErrorHandler} is being used. + * @param iterator the {@link ConsumerRecords} iterator. * @return an exception. * @throws Error an error. */ diff --git a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/DestinationTopicContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/DestinationTopicContainer.java index 0c6d54e51b..25dc22705b 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/DestinationTopicContainer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/DestinationTopicContainer.java @@ -52,7 +52,7 @@ public interface DestinationTopicContainer { * be forwarded to, since that depends on different factors. * * If you need to find out the exact next topic for a message use the - * {@link DestinationTopicResolver#resolveDestinationTopic(String, Integer, Exception, long)} + * {@link DestinationTopicResolver#resolveDestinationTopic(String, String, Integer, Exception, long)} * method instead. * @param mainListenerId the listener id. * @param topicName the topic name of the DestinationTopic to be returned. diff --git a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationBuilder.java b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationBuilder.java index 795e0a948b..186ece3a77 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationBuilder.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationBuilder.java @@ -247,7 +247,7 @@ public RetryTopicConfigurationBuilder setTopicSuffixingStrategy(TopicSuffixingSt *
Note: for fixed backoffs, when this is configured as * {@link SameIntervalTopicReuseStrategy#SINGLE_TOPIC}, it has precedence over * the configuration done through - * {@link #useSingleTopicForFixedDelays(FixedDelayStrategy)}. + * {@link #useSingleTopicForSameIntervals()}. * @param sameIntervalTopicReuseStrategy the strategy. * @return the builder. * @since 3.0.4 diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler1Tests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler1Tests.java index 4932a04fcc..70ba8c8c69 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler1Tests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler1Tests.java @@ -61,9 +61,6 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** - * Copied from {@link ContainerStoppingErrorHandlerRecordModeTests} with a new error - * handler. - * * @author Gary Russell * @since 2.8 * diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler2Tests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler2Tests.java index 24147dc7f5..543960c2bb 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler2Tests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler2Tests.java @@ -59,9 +59,6 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** - * Copied from {@link ContainerStoppingErrorHandlerBatchModeTests} with a new error - * handler. - * * @author Gary Russell * @since 2.8 * diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler3Tests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler3Tests.java index 44abfdbd35..6fba8b9d99 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler3Tests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/CommonContainerStoppingErrorHandler3Tests.java @@ -60,9 +60,6 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** - * Copied from {@link ContainerStoppingBatchErrorHandlerTests} with a new error - * handler. - * * @author Gary Russell * @since 2.8 * diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchIntegrationTests.java index 398f90f6fa..98d1a46409 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchIntegrationTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchIntegrationTests.java @@ -47,8 +47,7 @@ import org.springframework.util.backoff.FixedBackOff; /** - * {@link DefaultErrorHandler} tests for batch listeners. Copied from - * {@link RecoveringBatchErrorHandlerIntegrationTests} changing error handler type. + * {@link DefaultErrorHandler} tests for batch listeners. * @author Gary Russell * @since 2.8 * diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchTests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchTests.java index 6b45ca09dd..c02763451b 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerBatchTests.java @@ -69,7 +69,6 @@ /** * {@link DefaultErrorHandler} tests for batch listeners. - * Copied from {@link RecoveringBatchErrorHandlerTests} replacing error handler type. * * @author Gary Russell * @since 2.8 diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerRecordTests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerRecordTests.java index 9a78e55b8f..397899b017 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerRecordTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/DefaultErrorHandlerRecordTests.java @@ -53,7 +53,6 @@ /** * {@link DefaultErrorHandler} tests for record listeners. - * Copied from {@link SeekToCurrentErrorHandlerTests} changing the error handler type. * * @author Gary Russell * @since 2.8