GH-914: Honor AllowBeanDefOverriding = false #915
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
Fixes spring-projects#914 * Rework `RabbitBootstrapConfiguration` into the `ImportBeanDefinitionRegistrar` and check for bean definitions presence it is going to register. This way an override from the `RabbitListenerTestBootstrap` is going to have a precedence and its `RabbitListenerTestHarness` won't allow a regular `RabbitListenerAnnotationBeanPostProcessor` to be registered * Rework `TestRabbitTemplate` to gather all the listener container from the `ContextRefreshedEvent` instead of the `SmartInitializingSingleton`. Looks like Spring doesn't care about their order, therefore we need to be sure that `RabbitListenerAnnotationBeanPostProcessor` has populated its `registry` with containers before. * Demonstrate that `allowBeanDefinitionOverriding = false` works well now in the `ExampleRabbitListenerCaptureTest` * Optimize `checkTestConfigs` and `updateCopyrights` Gradle tasks for their `inputs` and `outputs` for better `UP-TO-DATE` handling **Cherry-pick to 2.1.x without `build.gradle` changes**
|
See travis errors. |
|
Looks like now its' green. |
garyrussell
pushed a commit
that referenced
this pull request
Feb 22, 2019
* GH-914: Honor AllowBeanDefOverriding = false Fixes #914 * Rework `RabbitBootstrapConfiguration` into the `ImportBeanDefinitionRegistrar` and check for bean definitions presence it is going to register. This way an override from the `RabbitListenerTestBootstrap` is going to have a precedence and its `RabbitListenerTestHarness` won't allow a regular `RabbitListenerAnnotationBeanPostProcessor` to be registered * Rework `TestRabbitTemplate` to gather all the listener container from the `ContextRefreshedEvent` instead of the `SmartInitializingSingleton`. Looks like Spring doesn't care about their order, therefore we need to be sure that `RabbitListenerAnnotationBeanPostProcessor` has populated its `registry` with containers before. * Demonstrate that `allowBeanDefinitionOverriding = false` works well now in the `ExampleRabbitListenerCaptureTest` * Optimize `checkTestConfigs` and `updateCopyrights` Gradle tasks for their `inputs` and `outputs` for better `UP-TO-DATE` handling **Cherry-pick to 2.1.x without `build.gradle` changes** * * Fix typo in the `ExampleRabbitListenerCaptureTest`
|
And cherry-picked as 5fccf26 after removing gradle changes. |
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.
Fixes #914
RabbitBootstrapConfigurationinto theImportBeanDefinitionRegistrarand check for bean definitions presence it is going to register.
This way an override from the
RabbitListenerTestBootstrapis going tohave a precedence and its
RabbitListenerTestHarnesswon't allow aregular
RabbitListenerAnnotationBeanPostProcessorto be registeredTestRabbitTemplateto gather all the listener containerfrom the
ContextRefreshedEventinstead of theSmartInitializingSingleton.Looks like Spring doesn't care about their order, therefore we need to
be sure that
RabbitListenerAnnotationBeanPostProcessorhas populatedits
registrywith containers before.allowBeanDefinitionOverriding = falseworks wellnow in the
ExampleRabbitListenerCaptureTestcheckTestConfigsandupdateCopyrightsGradle tasks fortheir
inputsandoutputsfor betterUP-TO-DATEhandlingCherry-pick to 2.1.x without
build.gradlechanges