Fix SourcePollingChAdFB autoStartup propagation #3587
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
The `spring.integration.properties` can come with the `noAutoStartup` property where we can specify a source polling channel adapter endpoint to not start automatically. Turns out the `SourcePollingChannelAdapterFactoryBean` propagates its `autoStartup` property unconditionally which will skip the `noAutoStartup` value because an `AbstractEndpoint.setAutoStartup()` sets an `autoStartupSetExplicitly` state * Fix `SourcePollingChannelAdapterFactoryBean` to rely on a `Boolean` object state and don't call target endpoint `setAutoStartup()` if it was not set * Adjust `spring.integration.properties` in tests to use `noAutoStartup` for some `SourcePollingChannelAdapterFactoryBean` * Verify that property was applied in the `IntegrationFlowTests.testWithSupplierMessageSourceImpliedPoller()` **Cherry-pick to `5.4.x` & `5.3.x`**
garyrussell
approved these changes
Jul 7, 2021
|
And cherry-picked to 5.4.x, and to 5.3.x after resolving conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The
spring.integration.propertiescan come with thenoAutoStartupproperty where we can specify a source polling channel adapter endpoint to
not start automatically.
Turns out the
SourcePollingChannelAdapterFactoryBeanpropagates itsautoStartupproperty unconditionally which will skip thenoAutoStartupvaluebecause an
AbstractEndpoint.setAutoStartup()sets anautoStartupSetExplicitlystateSourcePollingChannelAdapterFactoryBeanto rely on aBooleanobject stateand don't call target endpoint
setAutoStartup()if it was not setspring.integration.propertiesin tests to usenoAutoStartupfor some
SourcePollingChannelAdapterFactoryBeanIntegrationFlowTests.testWithSupplierMessageSourceImpliedPoller()Cherry-pick to
5.4.x&5.3.x