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

Direct access to requester from ClientRSConnector

Browse Source 
Since `RSocketRequester` is now lazy load on client side
there is no need to wrap it into a `Mono`.

* Change `getRSocketRequester()` to a plain getter

If there is a requirement to force connect to the server for receiving
requests from there, the `ClientRSocketConnector.connect()` should be used
This commit is contained in:
Artem Bilan
2020-07-22 09:24:05 -04:00
parent ff44382d94
commit 2c42c9181d
3 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java
View File

@@ -29,8 +29,6 @@ import org.springframework.util.MimeType;
import io.rsocket.transport.ClientTransport;
import io.rsocket.transport.netty.client.TcpClientTransport;
import io.rsocket.transport.netty.client.WebsocketClientTransport;
import reactor.core.Disposable;
import reactor.core.publisher.Mono;
/**
* A client {@link AbstractRSocketConnector} extension to the RSocket connection.
@@ -58,7 +56,7 @@ public class ClientRSocketConnector extends AbstractRSocketConnector {
private boolean autoConnect;
private Mono<RSocketRequester> rsocketRequesterMono;
private RSocketRequester rsocketRequester;
/**
* Instantiate a connector based on the {@link TcpClientTransport}.
@@ -175,7 +173,7 @@ public class ClientRSocketConnector extends AbstractRSocketConnector {
public void afterPropertiesSet() {
super.afterPropertiesSet();
RSocketRequester rsocketRequester = RSocketRequester.builder()
this.rsocketRequester = RSocketRequester.builder()
.dataMimeType(getDataMimeType())
.metadataMimeType(getMetadataMimeType())
.rsocketStrategies(getRSocketStrategies())
@@ -186,11 +184,6 @@ public class ClientRSocketConnector extends AbstractRSocketConnector {
connector.acceptor(this.rSocketMessageHandler.responder()))
.apply((builder) -> this.setupMetadata.forEach(builder::setupMetadata))
.transport(this.clientTransport);
this.rsocketRequesterMono =
Mono.just(rsocketRequester)
.doOnSubscribe((sub) -> rsocketRequester.rsocketClient().source().subscribe())
.cache();
}
@Override
@@ -207,21 +200,18 @@ public class ClientRSocketConnector extends AbstractRSocketConnector {
@Override
public void destroy() {
this.rsocketRequesterMono
.flatMap((requester) -> requester.rsocketClient().source())
.doOnNext(Disposable::dispose)
.subscribe();
this.rsocketRequester.rsocketClient().dispose();
}
/**
* Perform subscription into the RSocket server for incoming requests.
*/
public void connect() {
this.rsocketRequesterMono.subscribe();
this.rsocketRequester.rsocketClient().source().subscribe();
}
public Mono<RSocketRequester> getRSocketRequester() {
return this.rsocketRequesterMono;
public RSocketRequester getRSocketRequester() {
return this.rsocketRequester;
}
}

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

@@ -89,7 +89,7 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
private EvaluationContext evaluationContext;
@Nullable
private Mono<RSocketRequester> rsocketRequesterMono;
private RSocketRequester rsocketRequester;
/**
* Instantiate based on the provided RSocket endpoint {@code route}
@@ -207,27 +207,24 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
super.doInit();
this.evaluationContext = ExpressionUtils.createStandardEvaluationContext(getBeanFactory());
if (this.clientRSocketConnector != null) {
this.rsocketRequesterMono = this.clientRSocketConnector.getRSocketRequester();
this.rsocketRequester = this.clientRSocketConnector.getRSocketRequester();
}
}
@Override
protected Object handleRequestMessage(Message<?> requestMessage) {
RSocketRequester rsocketRequester = requestMessage.getHeaders()
.get(RSocketRequesterMethodArgumentResolver.RSOCKET_REQUESTER_HEADER, RSocketRequester.class);
Mono<RSocketRequester> requesterMono;
if (rsocketRequester != null) {
requesterMono = Mono.just(rsocketRequester);
}
else {
requesterMono = this.rsocketRequesterMono;
RSocketRequester requester =
requestMessage.getHeaders()
.get(RSocketRequesterMethodArgumentResolver.RSOCKET_REQUESTER_HEADER, RSocketRequester.class);
if (requester == null) {
requester = this.rsocketRequester;
}
Assert.notNull(requesterMono,
Assert.notNull(requester,
() -> "The 'RSocketRequester' must be configured via 'ClientRSocketConnector' or provided in the '" +
RSocketRequesterMethodArgumentResolver.RSOCKET_REQUESTER_HEADER + "' request message headers.");
return requesterMono
return Mono.just(requester)
.map((rSocketRequester) -> createRequestSpec(rSocketRequester, requestMessage))
.map((requestSpec) -> prepareRetrieveSpec(requestSpec, requestMessage))
.flatMap((retrieveSpec) -> performRetrieve(retrieveSpec, requestMessage));

2
spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/inbound/RSocketInboundGatewayIntegrationTests.java
View File

@@ -97,7 +97,7 @@ public class RSocketInboundGatewayIntegrationTests {
}
else {
this.clientRsocketRequester =
this.clientRSocketConnector.getRSocketRequester().block(Duration.ofSeconds(10));
this.clientRSocketConnector.getRSocketRequester();
}
}