jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use private access in FlipperRSocketResponder

Browse Source 
Summary:
Changing FlipperRSocketResponder to only use public parts of FlipperConnectionManagerImpl.

This means we can test it by injecting a FCM mock, and it can use its public interface.

Reviewed By: passy

Differential Revision: D14000078

fbshipit-source-id: c0431a888b0ca041807631c81b99fb8b947274d6
This commit is contained in:
John Knox
2019-02-11 14:01:32 -08:00
committed by Facebook Github Bot
parent c48c1a728a
commit 5da8f35ee3
8 changed files with 142 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xplat/Flipper/FlipperRSocketResponder.cpp
View File

@@ -31,7 +31,7 @@ void FlipperRSocketResponder::handleFireAndForget(
std::make_unique<FireAndForgetBasedFlipperResponder>(websocket_, id);
}
websocket_->callbacks_->onMessageReceived(
websocket_->onMessageReceived(
folly::parseJson(payload), std::move(responder));
}
@@ -44,7 +44,7 @@ FlipperRSocketResponder::handleRequestResponse(
auto dynamicSingle = yarpl::single::Single<folly::dynamic>::create(
[payload = std::move(requestString), this](auto observer) {
auto responder = std::make_unique<FlipperResponderImpl>(observer);
websocket_->callbacks_->onMessageReceived(
websocket_->onMessageReceived(
folly::parseJson(payload), std::move(responder));
});
@@ -53,19 +53,18 @@ FlipperRSocketResponder::handleRequestResponse(
observer->onSubscribe(yarpl::single::SingleSubscriptions::empty());
dynamicSingle->subscribe(
[observer, this](folly::dynamic d) {
websocket_->connectionEventBase_->runInEventBaseThread(
[observer, d]() {
try {
observer->onSuccess(toRSocketPayload(d));
eventBase_->runInEventBaseThread([observer, d]() {
try {
observer->onSuccess(toRSocketPayload(d));
} catch (std::exception& e) {
log(e.what());
observer->onError(e);
}
});
} catch (std::exception& e) {
log(e.what());
observer->onError(e);
}
});
},
[observer, this](folly::exception_wrapper e) {
websocket_->connectionEventBase_->runInEventBaseThread(
eventBase_->runInEventBaseThread(
[observer, e]() { observer->onError(e); });
});
});