Skip to content

Wire onSubscribe in *Connector. #99

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 1 commit into from
Jun 22, 2016
Merged

Wire onSubscribe in *Connector. #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions ...-tcp/src/main/java/io/reactivesocket/transport/tcp/client/TcpReactiveSocketConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public Publisher<ReactiveSocket> connect(SocketAddress address) {
Publisher<ClientTcpDuplexConnection> connection
= ClientTcpDuplexConnection.create(address, eventLoopGroup);

return s -> connection.subscribe(new Subscriber<ClientTcpDuplexConnection>() {
return subscriber -> connection.subscribe(new Subscriber<ClientTcpDuplexConnection>() {
@Override
public void onSubscribe(Subscription s) {
s.request(1);
subscriber.onSubscribe(s);
}

@Override
Expand All @@ -58,21 +58,20 @@ public void onNext(ClientTcpDuplexConnection connection) {
reactiveSocket.start(new Completable() {
@Override
public void success() {
s.onSubscribe(EmptySubscription.INSTANCE);
s.onNext(reactiveSocket);
s.onComplete();
subscriber.onNext(reactiveSocket);
subscriber.onComplete();
}

@Override
public void error(Throwable e) {
s.onError(e);
subscriber.onError(e);
}
});
}

@Override
public void onError(Throwable t) {
s.onError(t);
subscriber.onError(t);
}

@Override
Expand Down
15 changes: 7 additions & 8 deletions ...n/java/io/reactivesocket/transport/websocket/client/WebSocketReactiveSocketConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public Publisher<ReactiveSocket> connect(SocketAddress address) {
Publisher<ClientWebSocketDuplexConnection> connection
= ClientWebSocketDuplexConnection.create((InetSocketAddress)address, path, eventLoopGroup);

return s -> connection.subscribe(new Subscriber<ClientWebSocketDuplexConnection>() {
return subscriber -> connection.subscribe(new Subscriber<ClientWebSocketDuplexConnection>() {
@Override
public void onSubscribe(Subscription s) {
s.request(1);
subscriber.onSubscribe(s);
}

@Override
Expand All @@ -65,26 +65,25 @@ public void onNext(ClientWebSocketDuplexConnection connection) {
reactiveSocket.start(new Completable() {
@Override
public void success() {
s.onSubscribe(EmptySubscription.INSTANCE);
s.onNext(reactiveSocket);
s.onComplete();
subscriber.onNext(reactiveSocket);
subscriber.onComplete();
}

@Override
public void error(Throwable e) {
s.onError(e);
subscriber.onError(e);
}
});
}

@Override
public void onError(Throwable t) {
s.onError(t);
subscriber.onError(t);
}

@Override
public void onComplete() {
s.onComplete();
subscriber.onComplete();
}
});
} else {
Expand Down