From cf5b654f96da07769e79caecf189ab3429e49ef2 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Tue, 21 Mar 2023 12:07:19 -0500 Subject: [PATCH] Polish "Switch to single topic for same intervals in Spring Kafka retry config" See gh-34504 --- .../boot/autoconfigure/kafka/KafkaAutoConfiguration.java | 1 - .../kafka/KafkaAutoConfigurationIntegrationTests.java | 4 ++-- .../boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java index d9e09f6566..cf7b44e1a9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java @@ -157,7 +157,6 @@ public class KafkaAutoConfiguration { @Bean @ConditionalOnProperty(name = "spring.kafka.retry.topic.enabled") @ConditionalOnSingleCandidate(KafkaTemplate.class) - @SuppressWarnings("deprecation") public RetryTopicConfiguration kafkaRetryTopicConfiguration(KafkaTemplate kafkaTemplate) { KafkaProperties.Retry.Topic retryTopic = this.properties.getRetry().getTopic(); RetryTopicConfigurationBuilder builder = RetryTopicConfigurationBuilder.newInstance() diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java index 1be7c87581..2b6d6e849a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java @@ -105,7 +105,7 @@ class KafkaAutoConfigurationIntegrationTests { "spring.kafka.consumer.auto-offset-reset=earliest"); RetryTopicConfiguration configuration = this.context.getBean(RetryTopicConfiguration.class); assertThat(configuration.getDestinationTopicProperties()).extracting(DestinationTopic.Properties::delay) - .containsExactly(0L, 100L, 200L, 300L, 300L, 0L); + .containsExactly(0L, 100L, 200L, 300L, 0L); KafkaTemplate template = this.context.getBean(KafkaTemplate.class); template.send(TEST_RETRY_TOPIC, "foo", "bar"); RetryListener listener = this.context.getBean(RetryListener.class); @@ -116,7 +116,7 @@ class KafkaAutoConfigurationIntegrationTests { .asList() .hasSize(5) .containsSequence("testRetryTopic", "testRetryTopic-retry-0", "testRetryTopic-retry-1", - "testRetryTopic-retry-2", "testRetryTopic-retry-3"); + "testRetryTopic-retry-2"); } @Test diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index 432b5cd267..22cb10dcc1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -364,10 +364,10 @@ class KafkaAutoConfigurationTests { "spring.kafka.retry.topic.multiplier=2", "spring.kafka.retry.topic.max-delay=300ms") .run((context) -> { RetryTopicConfiguration configuration = context.getBean(RetryTopicConfiguration.class); - assertThat(configuration.getDestinationTopicProperties()).hasSize(6) + assertThat(configuration.getDestinationTopicProperties()).hasSize(5) .extracting(DestinationTopic.Properties::delay, DestinationTopic.Properties::suffix) .containsExactly(tuple(0L, ""), tuple(100L, "-retry-0"), tuple(200L, "-retry-1"), - tuple(300L, "-retry-2"), tuple(300L, "-retry-3"), tuple(0L, "-dlt")); + tuple(300L, "-retry-2"), tuple(0L, "-dlt")); }); }