INT-4513: Clean IntManageConf from removed beans #2530
Closed
Conversation
This file contains 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
JIRA: https://jira.spring.io/browse/INT-4513 The `IntegrationManagementConfigurer` keeps metrics beans in its local stores. When we add beans at runtime, they are not removed from those caches after their removal * Implement `DestructionAwareBeanPostProcessor` in the `IntegrationManagementConfigurer` and clean up caches according provided bean type and its name * Improve `ManualFlowTests` and `FtpTests` to be sure that `IntegrationManagementConfigurer` caches are cleared after destroying `IntegrationFlowRegistration` **Cherry-pick to 5.0.x**
garyrussell
reviewed
Jul 27, 2018
| @@ -246,7 +247,8 @@ public void afterSingletonsInstantiated() { | |||
| this.metricsFactory = new DefaultMetricsFactory(); | |||
| } | |||
| this.sourceConfigurers.putAll(this.applicationContext.getBeansOfType(MessageSourceMetricsConfigurer.class)); | |||
| Map<String, IntegrationManagement> managed = this.applicationContext.getBeansOfType(IntegrationManagement.class); | |||
| Map<String, IntegrationManagement> managed = this.applicationContext | |||
| .getBeansOfType(IntegrationManagement.class); | |||
There was a problem hiding this comment.
Shouldn't we suppress eager init here too? (and other gBOT calls in this class).
There was a problem hiding this comment.
Well, I believe it isn't going to harm, but at the same time it is idempotent here: all getBeansOfType() is called only from the afterSingletonsInstantiated() which is done only once.
There was a problem hiding this comment.
ok; I'll fix the checkstyle during merge.
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.
JIRA: https://jira.spring.io/browse/INT-4513
The
IntegrationManagementConfigurerkeeps metrics beans in its localstores.
When we add beans at runtime, they are not removed from those caches
after their removal
DestructionAwareBeanPostProcessorin theIntegrationManagementConfigurerand clean up caches according provided bean type and its name
ManualFlowTestsandFtpTeststo be sure thatIntegrationManagementConfigurercaches are cleared after destroyingIntegrationFlowRegistrationCherry-pick to 5.0.x