Fix MMIHelper for reinitialization #2786
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
If we provide a custom `MessageHandlerMethodFactory`, the `MessagingMethodInvokerHelper` obtains its bean and reinitialize a `handlerMethod`, but it is done only for single, explicit and provided method. In case of `Function` or `Consumer` we use local names for methods to extract, but this is not populated to properties of the `MessagingMethodInvokerHelper` * Change an internal `MessagingMethodInvokerHelper` logic to recreate `InvocableHandlerMethod` instances based on the `MessageHandlerMethodFactory` bean for all the methods scanned on the target. * Populate a `handlerMethodsList` for the purpose above even if we have only one candidate * Fix `AggregatorParserTests` to reflect the current logic around `handlerMethodsList` * Prove that new logic works well with a custom `MessageHandlerMethodFactory` bean in the `MessagingAnnotationsWithBeanAnnotationTests` **Cherry-pick to 5.1.x**
|
Note: this might not back-port clearly to previous version because of refactoring according Sonar reports. Thanks |
garyrussell
reviewed
Mar 7, 2019
| @@ -359,7 +360,7 @@ private MessagingMethodInvokerHelper(Object targetObject, Class<? extends Annota | |||
| } | |||
There was a problem hiding this comment.
This CTOR should be moved up, it is out of place - not really related to this issue, though.
|
I would prefer to resolve those smells when I have already a report from Sonar. |
artembilan
added a commit
that referenced
this pull request
Mar 8, 2019
* Fix MMIHelper for reinitialization If we provide a custom `MessageHandlerMethodFactory`, the `MessagingMethodInvokerHelper` obtains its bean and reinitialize a `handlerMethod`, but it is done only for single, explicit and provided method. In case of `Function` or `Consumer` we use local names for methods to extract, but this is not populated to properties of the `MessagingMethodInvokerHelper` * Change an internal `MessagingMethodInvokerHelper` logic to recreate `InvocableHandlerMethod` instances based on the `MessageHandlerMethodFactory` bean for all the methods scanned on the target. * Populate a `handlerMethodsList` for the purpose above even if we have only one candidate * Fix `AggregatorParserTests` to reflect the current logic around `handlerMethodsList` * Prove that new logic works well with a custom `MessageHandlerMethodFactory` bean in the `MessagingAnnotationsWithBeanAnnotationTests` **Cherry-pick to 5.1.x** * * Move CTOR to the proper place # Conflicts: # spring-integration-core/src/main/java/org/springframework/integration/handler/support/MessagingMethodInvokerHelper.java # spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
|
Back-ported to |
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.
If we provide a custom
MessageHandlerMethodFactory, theMessagingMethodInvokerHelperobtains its bean and reinitialize ahandlerMethod, but it is done only for single, explicitand provided method.
In case of
FunctionorConsumerwe use local names for methods toextract, but this is not populated to properties of the
MessagingMethodInvokerHelperMessagingMethodInvokerHelperlogic to recreateInvocableHandlerMethodinstances based on theMessageHandlerMethodFactorybean for all the methods scanned on the target.
handlerMethodsListfor the purpose above even if we haveonly one candidate
AggregatorParserTeststo reflect the current logic aroundhandlerMethodsListMessageHandlerMethodFactorybean in the
MessagingAnnotationsWithBeanAnnotationTestsCherry-pick to 5.1.x