Skip to content

GH-3514: Change default template bean name from retryTopicDefaultKafkaTemplate to defaultRetryTopicKafkaTemplate. #3543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2024
Merged

GH-3514: Change default template bean name from retryTopicDefaultKafkaTemplate to defaultRetryTopicKafkaTemplate. #3543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0014b59
Fix: Replace `retryTopicDefaultKafkaTemplate` with `RetryTopicBeanNam…
JeonDaehong Oct 8, 2024
a1114de
Fix: Replace `retryTopicDefaultKafkaTemplate` with `defaultRetryTopic…
JeonDaehong Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-kafka/src/main/java/org/springframework/kafka/annotation/RetryableTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
*
* The bean name of the {@link org.springframework.kafka.core.KafkaTemplate} bean that
* will be used to forward the message to the retry and Dlt topics. If not specified,
* a bean with name {@code retryTopicDefaultKafkaTemplate} or {@code kafkaTemplate}
* a bean with name {@code defaultRetryTopicKafkaTemplate} or {@code kafkaTemplate}
* will be looked up.
*
* @return the kafkaTemplate bean name.
Expand Down
4 changes: 2 additions & 2 deletions .../test/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private Method getAnnotatedMethod(String methodName) {
void shouldProvideFromAnnotation() {

// setup
willReturn(kafkaOperations).given(beanFactory).getBean("retryTopicDefaultKafkaTemplate", KafkaOperations.class);
willReturn(kafkaOperations).given(beanFactory).getBean(RetryTopicBeanNames.DEFAULT_KAFKA_TEMPLATE_BEAN_NAME, KafkaOperations.class);

// given
RetryTopicConfigurationProvider provider = new RetryTopicConfigurationProvider(beanFactory);
Expand Down Expand Up @@ -149,7 +149,7 @@ void shouldFindNone() {
void shouldProvideFromMetaAnnotation() {

// setup
willReturn(kafkaOperations).given(beanFactory).getBean("retryTopicDefaultKafkaTemplate", KafkaOperations.class);
willReturn(kafkaOperations).given(beanFactory).getBean(RetryTopicBeanNames.DEFAULT_KAFKA_TEMPLATE_BEAN_NAME, KafkaOperations.class);

// given
RetryTopicConfigurationProvider provider = new RetryTopicConfigurationProvider(beanFactory);
Expand Down