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

Special handle for void in the RSocketOutGateway

Browse Source 
To avoid extra `Publisher` subscription work in the target
application "flatten" a returned empty `Flux` for the `void`
expected type into a `Mono.empty()` for automatic subscription
on the output channel
This commit is contained in:
Artem Bilan
2020-12-21 17:18:37 -05:00
committed by Gary Russell
parent c38da2f4ee
commit fa1ab223ae
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java
View File

@@ -22,6 +22,7 @@ import java.util.Map;
import org.reactivestreams.Publisher;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.ResolvableType;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.integration.expression.ExpressionUtils;
@@ -38,6 +39,7 @@ import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MimeType;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/**
@@ -298,12 +300,17 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
}
case requestStream:
case requestChannel:
Flux<?> result;
ResolvableType expectedType;
if (expectedResponseType instanceof Class<?>) {
return Mono.just(retrieveSpec.retrieveFlux((Class<?>) expectedResponseType));
expectedType = ResolvableType.forClass((Class<?>) expectedResponseType);
result = retrieveSpec.retrieveFlux((Class<?>) expectedResponseType);
}
else {
return Mono.just(retrieveSpec.retrieveFlux((ParameterizedTypeReference<?>) expectedResponseType));
expectedType = ResolvableType.forType((ParameterizedTypeReference<?>) expectedResponseType);
result = retrieveSpec.retrieveFlux((ParameterizedTypeReference<?>) expectedResponseType);
}
return isVoid(expectedType) ? result.then() : Mono.just(result);
default:
throw new UnsupportedOperationException("Unsupported interaction model: " + interactionModel);
}
@@ -346,4 +353,8 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private static boolean isVoid(ResolvableType type) {
return (Void.class.equals(type.resolve()) || void.class.equals(type.resolve()));
}
}