From ad1fca47ba2c90039f0de902762742ca23653d33 Mon Sep 17 00:00:00 2001 From: Seonghyeon Cho Date: Sun, 18 May 2025 18:18:58 +0900 Subject: [PATCH 1/2] Replace `FixedDelayStrategy` to `SameIntervalTopicReuseStrategy` in docs Signed-off-by: Seonghyeon Cho --- .../main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc | 2 +- .../springframework/kafka/annotation/EnableKafkaRetryTopic.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc b/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc index 1d97f7a26c..9a6db8007c 100644 --- a/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc +++ b/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc @@ -79,7 +79,7 @@ NOTE: The previous `FixedDelayStrategy` is now deprecated, and can be replaced b [source, java] ---- -@RetryableTopic(backoff = @Backoff(2_000), fixedDelayTopicStrategy = FixedDelayStrategy.SINGLE_TOPIC) +@RetryableTopic(backoff = @Backoff(2_000), sameIntervalTopicReuseStrategy = SameIntervalTopicReuseStrategy.SINGLE_TOPIC) @KafkaListener(topics = "my-annotated-topic") public void processMessage(MyPojo message) { // ... message processing diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafkaRetryTopic.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafkaRetryTopic.java index a798c76c3f..f6c4e1525c 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafkaRetryTopic.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafkaRetryTopic.java @@ -39,7 +39,7 @@ * @Component * public class MyListener { * - * @RetryableTopic(fixedDelayTopicStrategy = FixedDelayStrategy.SINGLE_TOPIC, backoff = @Backoff(4000)) + * @RetryableTopic(sameIntervalTopicReuseStrategy = SameIntervalTopicReuseStrategy.SINGLE_TOPIC, backoff = @Backoff(4000)) * @KafkaListener(topics = "myTopic") * public void listen(String message, @Header(KafkaHeaders.RECEIVED_TOPIC) String receivedTopic) { * logger.info("Message {} received in topic {} ", message, receivedTopic); From 3600a3aced27b12a107d23c2068eb3ed58ec81d4 Mon Sep 17 00:00:00 2001 From: Seonghyeon Cho Date: Sun, 18 May 2025 18:24:00 +0900 Subject: [PATCH 2/2] `useSingleTopicForFixedDelays` -> `useSingleTopicForSameIntervals` Signed-off-by: Seonghyeon Cho --- .../main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc b/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc index 9a6db8007c..d108a7616f 100644 --- a/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc +++ b/spring-kafka-docs/src/main/antora/modules/ROOT/pages/retrytopic/topic-naming.adoc @@ -94,7 +94,7 @@ public RetryTopicConfiguration myRetryTopic(KafkaTemplate templa .newInstance() .fixedBackOff(3_000) .maxAttempts(5) - .useSingleTopicForFixedDelays() + .useSingleTopicForSameIntervals() .create(template); } ----