Skip to content

Remove nested flatMap in RSocketFactory #493

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 2 commits into from
May 7, 2018
Merged

Remove nested flatMap in RSocketFactory #493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d31b1c
Remove nested flatMap in RSocketFactory
rdegnan May 7, 2018
6d98a5e
Remove flatMap in ServerRSocketFactory
rdegnan May 7, 2018
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
60 changes: 29 additions & 31 deletions rsocket-core/src/main/java/io/rsocket/RSocketFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,28 +228,21 @@ public Mono<RSocket> start() {
ackTimeout,
missedAcks);

Mono<RSocket> wrappedRSocketClient =
Mono.just(rSocketClient).map(plugins::applyClient);

DuplexConnection finalConnection = connection;
return wrappedRSocketClient.flatMap(
wrappedClientRSocket -> {
RSocket unwrappedServerSocket = acceptor.get().apply(wrappedClientRSocket);

Mono<RSocket> wrappedRSocketServer =
Mono.just(unwrappedServerSocket).map(plugins::applyServer);

return wrappedRSocketServer
.doOnNext(
rSocket ->
new RSocketServer(
multiplexer.asServerConnection(),
rSocket,
frameDecoder,
errorConsumer))
.then(finalConnection.sendOne(setupFrame))
.then(wrappedRSocketClient);
});
RSocket wrappedRSocketClient = plugins.applyClient(rSocketClient);

RSocket unwrappedServerSocket = acceptor.get().apply(wrappedRSocketClient);

RSocket wrappedRSocketServer = plugins.applyServer(unwrappedServerSocket);

RSocketServer rSocketServer = new RSocketServer(
multiplexer.asServerConnection(),
wrappedRSocketServer,
frameDecoder,
errorConsumer);

return connection
.sendOne(setupFrame)
.thenReturn(wrappedRSocketClient);
});
}
}
Expand Down Expand Up @@ -332,7 +325,7 @@ public Mono<T> start() {
});
}

private Mono<? extends Void> processSetupFrame(
private Mono<Void> processSetupFrame(
ClientServerInputMultiplexer multiplexer, Frame setupFrame) {
int version = Frame.Setup.version(setupFrame);
if (version != SetupFrameFlyweight.CURRENT_VERSION) {
Expand All @@ -355,15 +348,20 @@ private Mono<? extends Void> processSetupFrame(
errorConsumer,
StreamIdSupplier.serverSupplier());

Mono<RSocket> wrappedRSocketClient = Mono.just(rSocketClient).map(plugins::applyClient);
RSocket wrappedRSocketClient = plugins.applyClient(rSocketClient);

return wrappedRSocketClient
.flatMap(
sender -> acceptor.get().accept(setupPayload, sender).map(plugins::applyServer))
.map(
handler ->
new RSocketServer(
multiplexer.asClientConnection(), handler, frameDecoder, errorConsumer))
return acceptor
.get()
.accept(setupPayload, wrappedRSocketClient)
.doOnNext(unwrappedServerSocket -> {
RSocket wrappedRSocketServer = plugins.applyServer(unwrappedServerSocket);

RSocketServer rSocketServer = new RSocketServer(
multiplexer.asClientConnection(),
wrappedRSocketServer,
frameDecoder,
errorConsumer);
})
.then();
}
}
Expand Down