GH-10345: Migrate Kafka module to Core Retry #10387
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Related to: spring-projects#10345 * Replace `RetryTemplate` from Spring Retry to `RetryTemplate` from Spring Core since Spring Retry is at its sunset. There is no deprecation for Spring Retry API usage since the idea is to remove Spring Retry dependency altogether for the upcoming major for all projects in the Spring portfolio * Introduce a `KafkaInboundEndpoint.RetryContext` as an `AttributeAccessorSupport` extension to track the number of retries for functional compatibility
cppwfs
requested changes
Sep 5, 2025
| * @param consumer the consumer. | ||
| * @param runnable the runnable. | ||
| */ | ||
| default void doWithRetry(RetryTemplate template, @Nullable RecoveryCallback<?> callback, ConsumerRecord<?, ?> record, |
There was a problem hiding this comment.
Shouldn't doWithRetry be @Nullable since it can return a null?
There was a problem hiding this comment.
The return does not apply to the logic of Kafka Inbound Endpoints.
Therefore void here and just swallowing null return from the RetryTemplate.execute().
...n-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java
Show resolved
Hide resolved
...ain/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java
Show resolved
Hide resolved
* Remove redundant now `// NOSONAR` comments from the `KafkaInboundGateway` & `KafkaMessageDrivenChannelAdapter` * Fix missed in the previous commit `KafkaMessageDrivenChannelAdapter.setAttributesIfNecessary()` * Change the logic around `KafkaMessageDrivenChannelAdapter.sendMessageIfAny()` to the `doSendMessage()` to reflect its reality * Change conversion failure `debug` logic to `warn`
|
Good stuff 👍👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to: #10345
Replace
RetryTemplatefrom Spring Retry toRetryTemplatefrom Spring Core since Spring Retry is at its sunset.There is no deprecation for Spring Retry API usage since the idea is to remove Spring Retry dependency altogether for the upcoming major for all projects in the Spring portfolio
Introduce a
KafkaInboundEndpoint.RetryContextas anAttributeAccessorSupportextension to track the number of retries for functional compatibility