From 3c656de7faf6f6cf6943d07974980a2537fa9710 Mon Sep 17 00:00:00 2001 From: John Knox Date: Thu, 20 Sep 2018 16:58:30 -0700 Subject: [PATCH] Rename SonarClient to FlipperClient Summary: Part of the Sonar -> Flipper rename Reviewed By: passy Differential Revision: D9871902 fbshipit-source-id: 4b64953cb1a64235d47caaf0fabfb560bb85f7a2 --- android/src/main/cpp/sonar.cpp | 22 +++++----- iOS/FlipperKit/FlipperClient.mm | 8 ++-- iOS/SonarKitTestUtils/FlipperClient+Testing.h | 4 +- .../{SonarClient.cpp => FlipperClient.cpp} | 44 +++++++++---------- .../{SonarClient.h => FlipperClient.h} | 18 ++++---- xplat/FlipperTests/SonarClientTests.cpp | 28 ++++++------ 6 files changed, 62 insertions(+), 62 deletions(-) rename xplat/Flipper/{SonarClient.cpp => FlipperClient.cpp} (82%) rename xplat/Flipper/{SonarClient.h => FlipperClient.h} (79%) diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index aad9daf41..593823d95 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -291,42 +291,42 @@ class JFlipperClient : public jni::HybridClass { } void start() { - SonarClient::instance()->start(); + FlipperClient::instance()->start(); } void stop() { - SonarClient::instance()->stop(); + FlipperClient::instance()->stop(); } void addPlugin(jni::alias_ref plugin) { auto wrapper = std::make_shared(make_global(plugin)); - SonarClient::instance()->addPlugin(wrapper); + FlipperClient::instance()->addPlugin(wrapper); } void removePlugin(jni::alias_ref plugin) { - auto client = SonarClient::instance(); + auto client = FlipperClient::instance(); client->removePlugin(client->getPlugin(plugin->identifier())); } void subscribeForUpdates(jni::alias_ref stateListener) { - auto client = SonarClient::instance(); + auto client = FlipperClient::instance(); mStateListener = std::make_shared(stateListener); client->setStateListener(mStateListener); } void unsubscribe() { - auto client = SonarClient::instance(); + auto client = FlipperClient::instance(); mStateListener = nullptr; client->setStateListener(nullptr); } std::string getState() { - return SonarClient::instance()->getState(); + return FlipperClient::instance()->getState(); } jni::global_ref getStateSummary() { auto summary = jni::make_global(JStateSummary::create()); - auto elements = SonarClient::instance()->getStateElements(); + auto elements = FlipperClient::instance()->getStateElements(); for (auto&& element : elements) { std::string status; switch (element.state_) { @@ -340,7 +340,7 @@ class JFlipperClient : public jni::HybridClass { } jni::alias_ref getPlugin(const std::string& identifier) { - auto plugin = SonarClient::instance()->getPlugin(identifier); + auto plugin = FlipperClient::instance()->getPlugin(identifier); if (plugin) { auto wrapper = std::static_pointer_cast(plugin); return wrapper->jplugin; @@ -361,7 +361,7 @@ class JFlipperClient : public jni::HybridClass { const std::string appId, const std::string privateAppDirectory) { - SonarClient::init({ + FlipperClient::init({ { std::move(host), std::move(os), diff --git a/iOS/FlipperKit/FlipperClient.mm b/iOS/FlipperKit/FlipperClient.mm index 509b79721..35edc68de 100644 --- a/iOS/FlipperKit/FlipperClient.mm +++ b/iOS/FlipperKit/FlipperClient.mm @@ -9,7 +9,7 @@ #import "FlipperClient.h" #import "SonarCppWrapperPlugin.h" -#import +#import #include #include #import @@ -23,7 +23,7 @@ using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin; @implementation FlipperClient { - facebook::flipper::SonarClient *_cppClient; + facebook::flipper::FlipperClient *_cppClient; folly::ScopedEventBaseThread sonarThread; folly::ScopedEventBaseThread connectionThread; #if !TARGET_OS_SIMULATOR @@ -61,7 +61,7 @@ using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin; deviceName = [NSString stringWithFormat:@"%@ %@", [[UIDevice currentDevice] model], @"Simulator"]; #endif - facebook::flipper::SonarClient::init({ + facebook::flipper::FlipperClient::init({ { "localhost", "iOS", @@ -74,7 +74,7 @@ using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin; sonarThread.getEventBase(), connectionThread.getEventBase() }); - _cppClient = facebook::flipper::SonarClient::instance(); + _cppClient = facebook::flipper::FlipperClient::instance(); } return self; } diff --git a/iOS/SonarKitTestUtils/FlipperClient+Testing.h b/iOS/SonarKitTestUtils/FlipperClient+Testing.h index 20b4b2331..cd19dce45 100644 --- a/iOS/SonarKitTestUtils/FlipperClient+Testing.h +++ b/iOS/SonarKitTestUtils/FlipperClient+Testing.h @@ -11,11 +11,11 @@ #import -#import +#import #import @interface FlipperClient (Testing) -- (instancetype)initWithCppClient:(facebook::flipper::SonarClient *)cppClient; +- (instancetype)initWithCppClient:(facebook::flipper::FlipperClient *)cppClient; @end diff --git a/xplat/Flipper/SonarClient.cpp b/xplat/Flipper/FlipperClient.cpp similarity index 82% rename from xplat/Flipper/SonarClient.cpp rename to xplat/Flipper/FlipperClient.cpp index 63bf8dd5f..a8d7bd159 100644 --- a/xplat/Flipper/SonarClient.cpp +++ b/xplat/Flipper/FlipperClient.cpp @@ -6,7 +6,7 @@ * */ -#include "SonarClient.h" +#include "FlipperClient.h" #include "SonarConnectionImpl.h" #include "SonarResponderImpl.h" #include "SonarState.h" @@ -24,29 +24,29 @@ namespace facebook { namespace flipper { -static SonarClient* kInstance; +static FlipperClient* kInstance; using folly::dynamic; -void SonarClient::init(SonarInitConfig config) { +void FlipperClient::init(SonarInitConfig config) { auto state = std::make_shared(); auto context = std::make_shared(config.deviceData); kInstance = - new SonarClient(std::make_unique(std::move(config), state, context), state); + new FlipperClient(std::make_unique(std::move(config), state, context), state); } -SonarClient* SonarClient::instance() { +FlipperClient* FlipperClient::instance() { return kInstance; } -void SonarClient::setStateListener( +void FlipperClient::setStateListener( std::shared_ptr stateListener) { log("Setting state listener"); sonarState_->setUpdateListener(stateListener); } -void SonarClient::addPlugin(std::shared_ptr plugin) { - log("SonarClient::addPlugin " + plugin->identifier()); +void FlipperClient::addPlugin(std::shared_ptr plugin) { + log("FlipperClient::addPlugin " + plugin->identifier()); auto step = sonarState_->start("Add plugin " + plugin->identifier()); std::lock_guard lock(mutex_); @@ -63,8 +63,8 @@ void SonarClient::addPlugin(std::shared_ptr plugin) { }); } -void SonarClient::removePlugin(std::shared_ptr plugin) { - log("SonarClient::removePlugin " + plugin->identifier()); +void FlipperClient::removePlugin(std::shared_ptr plugin) { + log("FlipperClient::removePlugin " + plugin->identifier()); std::lock_guard lock(mutex_); performAndReportError([this, plugin]() { @@ -79,7 +79,7 @@ void SonarClient::removePlugin(std::shared_ptr plugin) { }); } -std::shared_ptr SonarClient::getPlugin( +std::shared_ptr FlipperClient::getPlugin( const std::string& identifier) { std::lock_guard lock(mutex_); if (plugins_.find(identifier) == plugins_.end()) { @@ -88,12 +88,12 @@ std::shared_ptr SonarClient::getPlugin( return plugins_.at(identifier); } -bool SonarClient::hasPlugin(const std::string& identifier) { +bool FlipperClient::hasPlugin(const std::string& identifier) { std::lock_guard lock(mutex_); return plugins_.find(identifier) != plugins_.end(); } -void SonarClient::disconnect(std::shared_ptr plugin) { +void FlipperClient::disconnect(std::shared_ptr plugin) { const auto& conn = connections_.find(plugin->identifier()); if (conn != connections_.end()) { connections_.erase(plugin->identifier()); @@ -101,22 +101,22 @@ void SonarClient::disconnect(std::shared_ptr plugin) { } } -void SonarClient::refreshPlugins() { +void FlipperClient::refreshPlugins() { performAndReportError([this]() { dynamic message = dynamic::object("method", "refreshPlugins"); socket_->sendMessage(message); }); } -void SonarClient::onConnected() { - log("SonarClient::onConnected"); +void FlipperClient::onConnected() { + log("FlipperClient::onConnected"); std::lock_guard lock(mutex_); connected_ = true; } -void SonarClient::onDisconnected() { - log("SonarClient::onDisconnected"); +void FlipperClient::onDisconnected() { + log("FlipperClient::onDisconnected"); auto step = sonarState_->start("Trigger onDisconnected callbacks"); std::lock_guard lock(mutex_); connected_ = false; @@ -128,7 +128,7 @@ void SonarClient::onDisconnected() { }); } -void SonarClient::onMessageReceived(const dynamic& message) { +void FlipperClient::onMessageReceived(const dynamic& message) { std::lock_guard lock(mutex_); performAndReportError([this, &message]() { const auto& method = message["method"]; @@ -198,7 +198,7 @@ void SonarClient::onMessageReceived(const dynamic& message) { }); } -void SonarClient::performAndReportError(const std::function& func) { +void FlipperClient::performAndReportError(const std::function& func) { try { func(); } catch (std::exception& e) { @@ -213,11 +213,11 @@ void SonarClient::performAndReportError(const std::function& func) { } } -std::string SonarClient::getState() { +std::string FlipperClient::getState() { return sonarState_->getState(); } -std::vector SonarClient::getStateElements() { +std::vector FlipperClient::getStateElements() { return sonarState_->getStateElements(); } diff --git a/xplat/Flipper/SonarClient.h b/xplat/Flipper/FlipperClient.h similarity index 79% rename from xplat/Flipper/SonarClient.h rename to xplat/Flipper/FlipperClient.h index 225a9e87f..8c005621d 100644 --- a/xplat/Flipper/SonarClient.h +++ b/xplat/Flipper/FlipperClient.h @@ -21,26 +21,26 @@ namespace facebook { namespace flipper { -class SonarClient : public SonarWebSocket::Callbacks { +class FlipperClient : public SonarWebSocket::Callbacks { public: /** - Call before accessing instance with SonarClient::instance(). This will set up + Call before accessing instance with FlipperClient::instance(). This will set up all the state needed to establish a Sonar connection. */ static void init(SonarInitConfig config); /** - Standard accessor for the shared SonarClient instance. This returns a - singleton instance to a shared SonarClient. First call to this function will - create the shared SonarClient. Must call SonarClient::initDeviceData() before - first call to SonarClient::instance(). + Standard accessor for the shared FlipperClient instance. This returns a + singleton instance to a shared FlipperClient. First call to this function will + create the shared FlipperClient. Must call FlipperClient::initDeviceData() before + first call to FlipperClient::instance(). */ - static SonarClient* instance(); + static FlipperClient* instance(); /** Only public for testing */ - SonarClient(std::unique_ptr socket, std::shared_ptr state) + FlipperClient(std::unique_ptr socket, std::shared_ptr state) : socket_(std::move(socket)), sonarState_(state) { auto step = sonarState_->start("Create client"); socket_->setCallbacks(this); @@ -88,7 +88,7 @@ class SonarClient : public SonarWebSocket::Callbacks { bool hasPlugin(const std::string& identifier); private: - static SonarClient* instance_; + static FlipperClient* instance_; bool connected_ = false; std::unique_ptr socket_; std::map> plugins_; diff --git a/xplat/FlipperTests/SonarClientTests.cpp b/xplat/FlipperTests/SonarClientTests.cpp index ef3e5fef7..fee76732a 100644 --- a/xplat/FlipperTests/SonarClientTests.cpp +++ b/xplat/FlipperTests/SonarClientTests.cpp @@ -6,7 +6,7 @@ * */ -#include +#include #include #include @@ -34,7 +34,7 @@ TEST(SonarClientTests, testSaneMocks) { TEST(SonarClientTests, testGetPlugins) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); client.start(); client.addPlugin(std::make_shared("Cat")); @@ -50,7 +50,7 @@ TEST(SonarClientTests, testGetPlugins) { TEST(SonarClientTests, testGetPlugin) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); const auto catPlugin = std::make_shared("Cat"); client.addPlugin(catPlugin); @@ -63,7 +63,7 @@ TEST(SonarClientTests, testGetPlugin) { TEST(SonarClientTests, testGetPluginWithDowncast) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); const auto catPlugin = std::make_shared("Cat"); client.addPlugin(catPlugin); @@ -72,7 +72,7 @@ TEST(SonarClientTests, testGetPluginWithDowncast) { TEST(SonarClientTests, testRemovePlugin) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); client.start(); auto plugin = std::make_shared("Test"); @@ -89,7 +89,7 @@ TEST(SonarClientTests, testRemovePlugin) { TEST(SonarClientTests, testStartStop) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); client.start(); EXPECT_TRUE(socket->isOpen()); @@ -100,7 +100,7 @@ TEST(SonarClientTests, testStartStop) { TEST(SonarClientTests, testConnectDisconnect) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); bool pluginConnected = false; const auto connectionCallback = [&](std::shared_ptr conn) { @@ -123,7 +123,7 @@ TEST(SonarClientTests, testConnectDisconnect) { TEST(SonarClientTests, testInitDeinit) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); bool pluginConnected = false; const auto connectionCallback = [&](std::shared_ptr conn) { @@ -161,7 +161,7 @@ TEST(SonarClientTests, testInitDeinit) { TEST(SonarClientTests, testRemovePluginWhenConnected) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); bool pluginConnected = false; const auto connectionCallback = [&](std::shared_ptr conn) { @@ -182,7 +182,7 @@ TEST(SonarClientTests, testRemovePluginWhenConnected) { TEST(SonarClientTests, testUnhandleableMethod) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); auto plugin = std::make_shared("Test"); client.addPlugin(plugin); @@ -202,7 +202,7 @@ TEST(SonarClientTests, testUnhandleableMethod) { TEST(SonarClientTests, testExecute) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); client.start(); const auto connectionCallback = [](std::shared_ptr conn) { @@ -232,7 +232,7 @@ TEST(SonarClientTests, testExecute) { TEST(SonarClientTests, testExecuteWithParams) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); const auto connectionCallback = [&](std::shared_ptr conn) { const auto receiver = [](const dynamic ¶ms, @@ -265,7 +265,7 @@ TEST(SonarClientTests, testExecuteWithParams) { TEST(SonarClientTests, testExceptionUnknownPlugin) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); client.start(); dynamic messageInit = dynamic::object("method", "init")( @@ -278,7 +278,7 @@ TEST(SonarClientTests, testExceptionUnknownPlugin) { TEST(SonarClientTests, testExceptionUnknownApi) { auto socket = new SonarWebSocketMock; - SonarClient client(std::unique_ptr{socket}, state); + FlipperClient client(std::unique_ptr{socket}, state); client.start(); dynamic messageInit = dynamic::object("method", "execute")(