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

Remove IntegrationPatternType.gateway

Browse Source 
The `GatewayProxyFactoryBean` really produces an Inbound Gateway
for downstream flow and its proxy becomes a start of the flow

* Determine a return type of the gateway method to indicate
that `void` one leads to the `IntegrationPatternType.inbound_channel_adapter`
instead of regular `IntegrationPatternType.inbound_gateway`
This commit is contained in:
Artem Bilan
2019-12-11 16:15:09 -05:00
parent 2263827b3f
commit 07f0aa95d6
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-core/src/main/java/org/springframework/integration/IntegrationPatternType.java
View File

@@ -54,8 +54,6 @@ public enum IntegrationPatternType {
inbound_gateway(IntegrationPatternCategory.messaging_endpoint),
gateway(IntegrationPatternCategory.messaging_endpoint),
splitter(IntegrationPatternCategory.message_routing),
transformer(IntegrationPatternCategory.message_transformation),
@@ -121,7 +119,6 @@ public enum IntegrationPatternType {
inbound_channel_adapter,
outbound_gateway,
inbound_gateway,
gateway,
bridge),
message_routing(

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

@@ -939,13 +939,17 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
private boolean isMonoReturn;
private boolean isVoidReturn;
MethodInvocationGateway(GatewayMethodInboundMessageMapper messageMapper) {
setRequestMapper(messageMapper);
}
@Override
public IntegrationPatternType getIntegrationPatternType() {
return IntegrationPatternType.gateway;
return this.isVoidReturn
? IntegrationPatternType.inbound_channel_adapter
: IntegrationPatternType.inbound_gateway;
}
@Nullable
@@ -973,6 +977,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
this.isMonoReturn = Mono.class.isAssignableFrom(this.returnType);
this.expectMessage = hasReturnParameterizedWithMessage(resolvableType);
}
this.isVoidReturn = isVoidReturnType(resolvableType);
}
private boolean hasReturnParameterizedWithMessage(ResolvableType resolvableType) {
@@ -980,6 +985,13 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
&& Message.class.isAssignableFrom(resolvableType.getGeneric(0).resolve(Object.class));
}
private boolean isVoidReturnType(ResolvableType resolvableType) {
Class<?> returnTypeToCheck = this.returnType;
if (Future.class.isAssignableFrom(this.returnType) || Mono.class.isAssignableFrom(this.returnType)) {
returnTypeToCheck = resolvableType.getGeneric(0).resolve(Object.class);
}
return Void.class.isAssignableFrom(returnTypeToCheck);
}
}
private final class Invoker implements Supplier<Object> {