Fix DSL to deal with beanNames for handlers #2707
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
When consumer endpoint is created by the Framework, the target `MessageHandler` gets a `componentName` from the `ConsumerEndpointFactoryBean`. Therefore we can't rely on the `getComponentName()` when we create beans from Java DSL. * Introduce `NamedComponent.getBeanName()` contract; make it default to the `getComponentName()`; implement this method from the `IntegrationObjectSupport` * Use this new `getBeanName()` from the `IntegrationFlowBeanPostProcessor` and `StandardIntegrationFlowContext` for better existing beans checks and possible reuse existing `MessageHandler` in different endpoints * Optimize `FixedSubscriberChannel` and implement `getBeanName()` over there * Implement `getBeanName()` in the `AbstractMessageSource`; use `ExpressionEvalMap` to evaluate headers expressions * Implement `getBeanName()` in `Trackable*Metrics` classes as delegation to the `this.trackable`
garyrussell
suggested changes
Jan 18, 2019
| this.discardChannelName = null; | ||
| } | ||
| } | ||
| this.discardChannel = getChannelResolver().resolveDestination(this.discardChannelName); |
There was a problem hiding this comment.
Possible NPE here when 2 concurrent threads.
garyrussell
approved these changes
Jan 22, 2019
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.
When consumer endpoint is created by the Framework, the target
MessageHandlergets acomponentNamefrom theConsumerEndpointFactoryBean.Therefore we can't rely on the
getComponentName()when we create beansfrom Java DSL.
NamedComponent.getBeanName()contract; make it defaultto the
getComponentName(); implement this method from theIntegrationObjectSupportgetBeanName()from theIntegrationFlowBeanPostProcessorand
StandardIntegrationFlowContextfor better existing beans checksand possible reuse existing
MessageHandlerin different endpointsFixedSubscriberChanneland implementgetBeanName()over theregetBeanName()in theAbstractMessageSource; useExpressionEvalMapto evaluate headers expressionsgetBeanName()inTrackable*Metricsclasses as delegationto the
this.trackable