Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3668: Add late-binding for GatewayProxyFB

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3668

Note: the `defaultRequestChannel`, `defaultReplyChannel` and `errorChannel` remain as `MessageChannel` references,
since they are really some global shared and it looks logical to require those channels be populated by end-user directly

**Cherry-pick to 4.1.x**
This commit is contained in:
Artem Bilan
2015-04-01 21:38:47 +03:00
committed by Gary Russell
parent 5e4f9fca2c
commit e31ff77580
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -311,7 +311,6 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
this.asyncSubmitListenableType = submitType.getClass();
}
}
this.start();
this.initialized = true;
}
}
@@ -449,21 +448,17 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
private MethodInvocationGateway createGatewayForMethod(Method method) {
Gateway gatewayAnnotation = method.getAnnotation(Gateway.class);
MessageChannel requestChannel = this.defaultRequestChannel;
String requestChannelName = null;
MessageChannel replyChannel = this.defaultReplyChannel;
String replyChannelName = null;
Long requestTimeout = this.defaultRequestTimeout;
Long replyTimeout = this.defaultReplyTimeout;
String payloadExpression = this.globalMethodMetadata != null ? this.globalMethodMetadata.getPayloadExpression()
: null;
Map<String, Expression> headerExpressions = new HashMap<String, Expression>();
if (gatewayAnnotation != null) {
String requestChannelName = gatewayAnnotation.requestChannel();
if (StringUtils.hasText(requestChannelName)) {
requestChannel = this.resolveChannelName(requestChannelName);
}
String replyChannelName = gatewayAnnotation.replyChannel();
if (StringUtils.hasText(replyChannelName)) {
replyChannel = this.resolveChannelName(replyChannelName);
}
requestChannelName = gatewayAnnotation.requestChannel();
replyChannelName = gatewayAnnotation.replyChannel();
/*
* INT-2636 Unspecified annotation attributes should not
* override the default values supplied by explicit configuration.
@@ -508,14 +503,8 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
if (!CollectionUtils.isEmpty(methodMetadata.getHeaderExpressions())) {
headerExpressions.putAll(methodMetadata.getHeaderExpressions());
}
String requestChannelName = methodMetadata.getRequestChannelName();
if (StringUtils.hasText(requestChannelName)) {
requestChannel = this.resolveChannelName(requestChannelName);
}
String replyChannelName = methodMetadata.getReplyChannelName();
if (StringUtils.hasText(replyChannelName)) {
replyChannel = this.resolveChannelName(replyChannelName);
}
requestChannelName = methodMetadata.getRequestChannelName();
replyChannelName = methodMetadata.getReplyChannelName();
String reqTimeout = methodMetadata.getRequestTimeout();
if (StringUtils.hasText(reqTimeout)){
requestTimeout = this.convert(reqTimeout, Long.class);
@@ -540,8 +529,18 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
gateway.setTaskScheduler(this.getTaskScheduler());
}
gateway.setBeanName(this.getComponentName());
gateway.setRequestChannel(requestChannel);
gateway.setReplyChannel(replyChannel);
if (StringUtils.hasText(requestChannelName)) {
gateway.setRequestChannelName(requestChannelName);
}
else {
gateway.setRequestChannel(requestChannel);
}
if (StringUtils.hasText(replyChannelName)) {
gateway.setReplyChannelName(replyChannelName);
}
else {
gateway.setReplyChannel(replyChannel);
}
if (requestTimeout == null) {
gateway.setRequestTimeout(-1);
}
@@ -562,13 +561,6 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
return gateway;
}
private MessageChannel resolveChannelName(String channelName) {
Assert.state(this.channelResolver != null, "ChannelResolver is required");
MessageChannel channel = this.channelResolver.resolveDestination(channelName);
Assert.notNull(channel, "failed to resolve channel '" + channelName + "'");
return channel;
}
// Lifecycle implementation
@Override // guarded by super#lifecycleLock