GH-10309: Don't register bean for internal `GatewayMH.gatewayProxyFac… #10311
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
…gatewayProxyFactoryBean` Fixes: spring-projects#10309 The call of the `BeanFactory.initializeBean()` on the internal `GatewayProxyFactoryBean` instance of the `GatewayMessageHandler` causes an extra bean to be processed everywhere. Since such a registration happens from the `GatewayMessageHandler.start()`, the `SpringIntegrationTestExecutionListener#prepareTestInstance` may suffer from a `ConcurrentModificationException` on the `autoStartupCandidates`. Just because its logic is to call `start()` from that `autoStartupCandidates` collection iteration. Essentially, we don't need that since a `GatewayMessageHandler` is a bean itself. The `GatewayProxyFactoryBean` is used internally to avoid logic duplication of the proxy creating on the provided interface. * Rework the logic of the `GatewayMessageHandler` to call all the respective `BeanFactory` call-backs manually. * Add an `IntegrationFlow` bean with a `gateway()` into the `MockMessageHandlerTests` to ensure that `SpringIntegrationTestExecutionListener` does not suffer from a `ConcurrentModificationException` anymore. **Auto-cherry-pick to `6.5.x`**
spring-builds
pushed a commit
that referenced
this pull request
Aug 14, 2025
…toryBean` (#10311) Fixes: #10309 The call of the `BeanFactory.initializeBean()` on the internal `GatewayProxyFactoryBean` instance of the `GatewayMessageHandler` causes an extra bean to be processed everywhere. Since such a registration happens from the `GatewayMessageHandler.start()`, the `SpringIntegrationTestExecutionListener#prepareTestInstance` may suffer from a `ConcurrentModificationException` on the `autoStartupCandidates`. Just because its logic is to call `start()` from that `autoStartupCandidates` collection iteration. Essentially, we don't need that since a `GatewayMessageHandler` is a bean itself. The `GatewayProxyFactoryBean` is used internally to avoid logic duplication of the proxy creating on the provided interface. * Rework the logic of the `GatewayMessageHandler` to call all the respective `BeanFactory` call-backs manually. * Add an `IntegrationFlow` bean with a `gateway()` into the `MockMessageHandlerTests` to ensure that `SpringIntegrationTestExecutionListener` does not suffer from a `ConcurrentModificationException` anymore. (cherry picked from commit 60314fe)
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.
…toryBean`
Fixes: #10309
The call of the
BeanFactory.initializeBean()on the internalGatewayProxyFactoryBeaninstance of theGatewayMessageHandlercauses an extra bean to be processed everywhere. Since such a registration happens from theGatewayMessageHandler.start(), theSpringIntegrationTestExecutionListener#prepareTestInstancemay suffer from aConcurrentModificationExceptionon theautoStartupCandidates.Just because its logic is to call
start()from thatautoStartupCandidatescollection iteration.Essentially, we don't need that since a
GatewayMessageHandleris a bean itself. TheGatewayProxyFactoryBeanis used internally to avoid logic duplication of the proxy creating on the provided interface.GatewayMessageHandlerto call all the respectiveBeanFactorycall-backs manually.IntegrationFlowbean with agateway()into theMockMessageHandlerTeststo ensure thatSpringIntegrationTestExecutionListenerdoes not suffer from aConcurrentModificationExceptionanymore.Auto-cherry-pick to
6.5.x