From 5350d3ce7a06138e3c766f032d840ab7fe7e5691 Mon Sep 17 00:00:00 2001 From: John Knox Date: Mon, 24 Sep 2018 05:53:45 -0700 Subject: [PATCH] Rename C++ SonarPlugin class Summary: Part of sonar -> flipper rename Reviewed By: passy Differential Revision: D9917615 fbshipit-source-id: e59f43bf003d30ae6be4d95bc4a21c92ab39f732 --- android/src/main/cpp/sonar.cpp | 2 +- iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h | 4 ++-- xplat/Flipper/FlipperClient.cpp | 8 ++++---- xplat/Flipper/FlipperClient.h | 12 ++++++------ xplat/Flipper/{SonarPlugin.h => FlipperPlugin.h} | 6 +++--- xplat/FlipperTestLib/SonarPluginMock.h | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) rename xplat/Flipper/{SonarPlugin.h => FlipperPlugin.h} (88%) diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index 7a014cba5..87b1a574c 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -231,7 +231,7 @@ class AndroidFlipperStateUpdateListener : public SonarStateUpdateListener { jni::global_ref jStateListener; }; -class JFlipperPluginWrapper : public SonarPlugin { +class JFlipperPluginWrapper : public FlipperPlugin { public: jni::global_ref jplugin; diff --git a/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h b/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h index 10d31a69e..c0199bdcd 100644 --- a/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h +++ b/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h @@ -9,7 +9,7 @@ #error This header can only be included in .mm (ObjC++) files #endif -#import +#import #import #import @@ -23,7 +23,7 @@ SonarCppWrapperPlugin is a simple C++ wrapper around Objective-C Sonar plugins that can be passed to SonarClient. This class allows developers to write pure Objective-C plugins if they want. */ -class SonarCppWrapperPlugin final : public facebook::flipper::SonarPlugin { +class SonarCppWrapperPlugin final : public facebook::flipper::FlipperPlugin { public: // Under ARC copying objCPlugin *does* increment its retain count SonarCppWrapperPlugin(ObjCPlugin objCPlugin) : _objCPlugin(objCPlugin) {} diff --git a/xplat/Flipper/FlipperClient.cpp b/xplat/Flipper/FlipperClient.cpp index 87e5be428..dedae0a17 100644 --- a/xplat/Flipper/FlipperClient.cpp +++ b/xplat/Flipper/FlipperClient.cpp @@ -45,7 +45,7 @@ void FlipperClient::setStateListener( sonarState_->setUpdateListener(stateListener); } -void FlipperClient::addPlugin(std::shared_ptr plugin) { +void FlipperClient::addPlugin(std::shared_ptr plugin) { log("FlipperClient::addPlugin " + plugin->identifier()); auto step = sonarState_->start("Add plugin " + plugin->identifier()); @@ -63,7 +63,7 @@ void FlipperClient::addPlugin(std::shared_ptr plugin) { }); } -void FlipperClient::removePlugin(std::shared_ptr plugin) { +void FlipperClient::removePlugin(std::shared_ptr plugin) { log("FlipperClient::removePlugin " + plugin->identifier()); std::lock_guard lock(mutex_); @@ -79,7 +79,7 @@ void FlipperClient::removePlugin(std::shared_ptr plugin) { }); } -std::shared_ptr FlipperClient::getPlugin( +std::shared_ptr FlipperClient::getPlugin( const std::string& identifier) { std::lock_guard lock(mutex_); if (plugins_.find(identifier) == plugins_.end()) { @@ -93,7 +93,7 @@ bool FlipperClient::hasPlugin(const std::string& identifier) { return plugins_.find(identifier) != plugins_.end(); } -void FlipperClient::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()); diff --git a/xplat/Flipper/FlipperClient.h b/xplat/Flipper/FlipperClient.h index d2bf0fabe..f155611f0 100644 --- a/xplat/Flipper/FlipperClient.h +++ b/xplat/Flipper/FlipperClient.h @@ -10,7 +10,7 @@ #include "FlipperConnectionImpl.h" #include "FlipperInitConfig.h" -#include "SonarPlugin.h" +#include "FlipperPlugin.h" #include "SonarState.h" #include "SonarWebSocket.h" #include @@ -65,16 +65,16 @@ class FlipperClient : public SonarWebSocket::Callbacks { void onMessageReceived(const folly::dynamic& message) override; - void addPlugin(std::shared_ptr plugin); + void addPlugin(std::shared_ptr plugin); - void removePlugin(std::shared_ptr plugin); + void removePlugin(std::shared_ptr plugin); void refreshPlugins(); void setStateListener( std::shared_ptr stateListener); - std::shared_ptr getPlugin(const std::string& identifier); + std::shared_ptr getPlugin(const std::string& identifier); std::string getState(); @@ -91,13 +91,13 @@ class FlipperClient : public SonarWebSocket::Callbacks { static FlipperClient* instance_; bool connected_ = false; std::unique_ptr socket_; - std::map> plugins_; + std::map> plugins_; std::map> connections_; std::mutex mutex_; std::shared_ptr sonarState_; void performAndReportError(const std::function& func); - void disconnect(std::shared_ptr plugin); + void disconnect(std::shared_ptr plugin); }; } // namespace flipper diff --git a/xplat/Flipper/SonarPlugin.h b/xplat/Flipper/FlipperPlugin.h similarity index 88% rename from xplat/Flipper/SonarPlugin.h rename to xplat/Flipper/FlipperPlugin.h index 9a7a79acd..9ae10693a 100644 --- a/xplat/Flipper/SonarPlugin.h +++ b/xplat/Flipper/FlipperPlugin.h @@ -13,9 +13,9 @@ namespace facebook { namespace flipper { -class SonarPlugin { +class FlipperPlugin { public: - virtual ~SonarPlugin() {} + virtual ~FlipperPlugin() {} /** The plugin's identifier. This should map to a javascript plugin @@ -25,7 +25,7 @@ class SonarPlugin { /** Called when a connection has been established between this plugin - and the corresponding plugin on the Sonar desktop app. The provided + and the corresponding plugin on the Flipper desktop app. The provided connection can be used to register method receivers as well as send messages back to the desktop app. */ diff --git a/xplat/FlipperTestLib/SonarPluginMock.h b/xplat/FlipperTestLib/SonarPluginMock.h index 51db4919a..31c2e85c1 100644 --- a/xplat/FlipperTestLib/SonarPluginMock.h +++ b/xplat/FlipperTestLib/SonarPluginMock.h @@ -8,13 +8,13 @@ #pragma once -#include +#include namespace facebook { namespace flipper { namespace test { -class SonarPluginMock : public SonarPlugin { +class SonarPluginMock : public FlipperPlugin { using ConnectionCallback = std::function)>; using DisconnectionCallback = std::function;