GH-10345: Migrate AMQP module into Spring Core Retry #10361
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 The Spring Retry project is in its sunset. There is an alternative in `spring-core`. * Fix AMQP module according to recent changes in the Spring AMQP project related to migration onto Spring Core Retry * Introduce `org.springframework.integration.core.RecoveryCallback` as an alternative to `RecoveryCallback` from Spring Retry * Rework `AmqpInboundChannelAdapter` & `AmqpInboundGateway` to always populate `ATTRIBUTES_HOLDER` when there is an `errorChannel` or `retryTemplate` since Spring Core Retry does not operation with a `context` abstraction. * Make `ErrorMessageSendingRecoverer` based on the Spring Integration `RecoveryCallback`. * Change `RequestHandlerRetryAdvice` to accept new `RecoveryCallback` * Modify affected classes in Kafka module to use new `RecoveryCallback` API * The other related (spotted) work is marked as `TODO` for subsequent fixes for this spring-projects#10345
|
@cppwfs , I have assigned you to review, but since you are busy with Spring One (Thank you and good luck!), I'm going to merge this myself when build is green since this is critical fix for currently failing builds. |
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
The Spring Retry project is in its sunset.
There is an alternative in
spring-core.org.springframework.integration.core.RecoveryCallbackas an alternative toRecoveryCallbackfrom Spring RetryAmqpInboundChannelAdapter&AmqpInboundGatewayto always populateATTRIBUTES_HOLDERwhen there is anerrorChannelorretryTemplatesince Spring Core Retry does not operation with acontextabstraction.ErrorMessageSendingRecovererbased on the Spring IntegrationRecoveryCallback.RequestHandlerRetryAdviceto accept newRecoveryCallbackRecoveryCallbackAPITODOfor subsequent fixes for this Replace the use of Spring Retry with Core Retry #10345