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

@@ -231,7 +231,7 @@ class AndroidFlipperStateUpdateListener : public SonarStateUpdateListener {
    jni::global_ref<JFlipperStateUpdateListener> jStateListener;
 };
 
-class JFlipperPluginWrapper : public SonarPlugin {
+class JFlipperPluginWrapper : public FlipperPlugin {
  public:
   jni::global_ref<JFlipperPlugin> jplugin;
 

iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h

@@ -9,7 +9,7 @@
 #error This header can only be included in .mm (ObjC++) files
 #endif
 
-#import <Flipper/SonarPlugin.h>
+#import <Flipper/FlipperPlugin.h>
 #import <FlipperKit/CppBridge/FlipperCppBridgingConnection.h>
 #import <FlipperKit/FlipperPlugin.h>
 
@@ -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) {}

xplat/Flipper/FlipperClient.cpp

@@ -45,7 +45,7 @@ void FlipperClient::setStateListener(
   sonarState_->setUpdateListener(stateListener);
 }
 
-void FlipperClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
+void FlipperClient::addPlugin(std::shared_ptr<FlipperPlugin> plugin) {
   log("FlipperClient::addPlugin " + plugin->identifier());
   auto step = sonarState_->start("Add plugin " + plugin->identifier());
 
@@ -63,7 +63,7 @@ void FlipperClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
   });
 }
 
-void FlipperClient::removePlugin(std::shared_ptr<SonarPlugin> plugin) {
+void FlipperClient::removePlugin(std::shared_ptr<FlipperPlugin> plugin) {
   log("FlipperClient::removePlugin " + plugin->identifier());
 
   std::lock_guard<std::mutex> lock(mutex_);
@@ -79,7 +79,7 @@ void FlipperClient::removePlugin(std::shared_ptr<SonarPlugin> plugin) {
   });
 }
 
-std::shared_ptr<SonarPlugin> FlipperClient::getPlugin(
+std::shared_ptr<FlipperPlugin> FlipperClient::getPlugin(
     const std::string& identifier) {
   std::lock_guard<std::mutex> 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<SonarPlugin> plugin) {
+void FlipperClient::disconnect(std::shared_ptr<FlipperPlugin> plugin) {
   const auto& conn = connections_.find(plugin->identifier());
   if (conn != connections_.end()) {
     connections_.erase(plugin->identifier());

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 <map>
@@ -65,16 +65,16 @@ class FlipperClient : public SonarWebSocket::Callbacks {
 
   void onMessageReceived(const folly::dynamic& message) override;
 
-  void addPlugin(std::shared_ptr<SonarPlugin> plugin);
+  void addPlugin(std::shared_ptr<FlipperPlugin> plugin);
 
-  void removePlugin(std::shared_ptr<SonarPlugin> plugin);
+  void removePlugin(std::shared_ptr<FlipperPlugin> plugin);
 
   void refreshPlugins();
 
   void setStateListener(
       std::shared_ptr<SonarStateUpdateListener> stateListener);
 
-  std::shared_ptr<SonarPlugin> getPlugin(const std::string& identifier);
+  std::shared_ptr<FlipperPlugin> 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<SonarWebSocket> socket_;
-  std::map<std::string, std::shared_ptr<SonarPlugin>> plugins_;
+  std::map<std::string, std::shared_ptr<FlipperPlugin>> plugins_;
   std::map<std::string, std::shared_ptr<FlipperConnectionImpl>> connections_;
   std::mutex mutex_;
   std::shared_ptr<SonarState> sonarState_;
 
   void performAndReportError(const std::function<void()>& func);
-  void disconnect(std::shared_ptr<SonarPlugin> plugin);
+  void disconnect(std::shared_ptr<FlipperPlugin> plugin);
 };
 
 } // namespace flipper

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.
   */

xplat/FlipperTestLib/SonarPluginMock.h

@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <Flipper/SonarPlugin.h>
+#include <Flipper/FlipperPlugin.h>
 
 namespace facebook {
 namespace flipper {
 namespace test {
 
-class SonarPluginMock : public SonarPlugin {
+class SonarPluginMock : public FlipperPlugin {
   using ConnectionCallback =
       std::function<void(std::shared_ptr<FlipperConnection>)>;
   using DisconnectionCallback = std::function<void()>;