Skip to content

Commit 8ecb85e

Browse files
JeonDaehongspring-builds
authored andcommitted
GH-3514: RetryableTopic javadoc/test update for defaultRetryTopicKafkaTemplate
Fixes: #3514 #3514 * Fix: Replace `retryTopicDefaultKafkaTemplate` with `defaultRetryTopicKafkaTemplate` in javadocs * Fix: Replace `retryTopicDefaultKafkaTemplate` with `RetryTopicBeanNames.DEFAULT_KAFKA_TEMPLATE_BEAN_NAME` in Test Code (cherry picked from commit f1cb003)
1 parent ff125d2 commit 8ecb85e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: spring-kafka/src/main/java/org/springframework/kafka/annotation/RetryableTopic.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
*
8282
* The bean name of the {@link org.springframework.kafka.core.KafkaTemplate} bean that
8383
* will be used to forward the message to the retry and Dlt topics. If not specified,
84-
* a bean with name {@code retryTopicDefaultKafkaTemplate} or {@code kafkaTemplate}
84+
* a bean with name {@code defaultRetryTopicKafkaTemplate} or {@code kafkaTemplate}
8585
* will be looked up.
8686
*
8787
* @return the kafkaTemplate bean name.

Diff for: spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationProviderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private Method getAnnotatedMethod(String methodName) {
8989
void shouldProvideFromAnnotation() {
9090

9191
// setup
92-
willReturn(kafkaOperations).given(beanFactory).getBean("retryTopicDefaultKafkaTemplate", KafkaOperations.class);
92+
willReturn(kafkaOperations).given(beanFactory).getBean(RetryTopicBeanNames.DEFAULT_KAFKA_TEMPLATE_BEAN_NAME, KafkaOperations.class);
9393

9494
// given
9595
RetryTopicConfigurationProvider provider = new RetryTopicConfigurationProvider(beanFactory);
@@ -149,7 +149,7 @@ void shouldFindNone() {
149149
void shouldProvideFromMetaAnnotation() {
150150

151151
// setup
152-
willReturn(kafkaOperations).given(beanFactory).getBean("retryTopicDefaultKafkaTemplate", KafkaOperations.class);
152+
willReturn(kafkaOperations).given(beanFactory).getBean(RetryTopicBeanNames.DEFAULT_KAFKA_TEMPLATE_BEAN_NAME, KafkaOperations.class);
153153

154154
// given
155155
RetryTopicConfigurationProvider provider = new RetryTopicConfigurationProvider(beanFactory);

0 commit comments

Comments
 (0)