Skip to content

GH-10309: Don't register bean for internal `GatewayMH.gatewayProxyFac… #10311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2025
Merged

GH-10309: Don't register bean for internal `GatewayMH.gatewayProxyFac… #10311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...ion-core/src/main/java/org/springframework/integration/gateway/GatewayMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.jspecify.annotations.Nullable;

import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.support.management.ManageableLifecycle;
Expand Down Expand Up @@ -158,9 +157,12 @@ private void initialize() {
this.gatewayProxyFactoryBean.setDefaultReplyTimeout(this.replyTimeout);
}

if (getBeanFactory() instanceof ConfigurableListableBeanFactory configurableListableBeanFactory) {
configurableListableBeanFactory.initializeBean(this.gatewayProxyFactoryBean, getComponentName() + "#gpfb");
}
this.gatewayProxyFactoryBean.setBeanName(getComponentName() + "#gpfb");
this.gatewayProxyFactoryBean.setBeanFactory(getBeanFactory());
this.gatewayProxyFactoryBean.setApplicationContext(getApplicationContext());
this.gatewayProxyFactoryBean.setBeanClassLoader(getBeanClassLoader());
this.gatewayProxyFactoryBean.afterPropertiesSet();

try {
this.exchanger = this.gatewayProxyFactoryBean.getObject();
}
Expand Down
7 changes: 7 additions & 0 deletions ...test/src/test/java/org/springframework/integration/test/mock/MockMessageHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.endpoint.ReactiveStreamsConsumer;
import org.springframework.integration.expression.ValueExpression;
import org.springframework.integration.handler.ExpressionEvaluatingMessageHandler;
Expand Down Expand Up @@ -365,6 +366,12 @@ public ReactiveMessageHandler reactiveMessageHandler() {
return message -> Mono.empty();
}

// Before the fix for https://github.com/spring-projects/spring-integration/issues/10309 this test suite has failed
@Bean
IntegrationFlow flowWithGateway() {
return flow -> flow.gateway(subFlow -> subFlow.bridge());
}

}

}