Rename facebook::sonar namespace

Summary: Pull Request resolved: https://github.com/facebook/flipper/pull/271

Reviewed By: passy

Differential Revision: D9861393

Pulled By: jknoxville

fbshipit-source-id: d65f751c35028748915023f33f273d6ec45863c8

android/src/main/cpp/sonar.cpp

@@ -26,7 +26,7 @@
 #include <Sonar/SonarState.h>
 
 using namespace facebook;
-using namespace facebook::sonar;
+using namespace facebook::flipper;
 
 namespace {
 

docs/testing.md

@@ -61,7 +61,7 @@ Start by creating your first test file in this directory `MySonarPluginTests.cpp
 #include <gtest/gtest.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 namespace test {
 
 TEST(MySonarPluginTests, testDummy) {
@@ -69,7 +69,7 @@ TEST(MySonarPluginTests, testDummy) {
 }
 
 } // namespace test
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook
 ```
 

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin+CPPInitialization.h

@@ -21,8 +21,8 @@ struct CachedEvent {
 
 @interface SKBufferingPlugin(CPPInitialization)
 
-- (instancetype)initWithVectorEventSize:(NSUInteger)size connectionAccessQueue:(std::shared_ptr<facebook::sonar::DispatchQueue>)connectionAccessQueue;
-- (instancetype)initWithDispatchQueue:(std::shared_ptr<facebook::sonar::DispatchQueue>)queue;
+- (instancetype)initWithVectorEventSize:(NSUInteger)size connectionAccessQueue:(std::shared_ptr<facebook::flipper::DispatchQueue>)connectionAccessQueue;
+- (instancetype)initWithDispatchQueue:(std::shared_ptr<facebook::flipper::DispatchQueue>)queue;
 
 @end
 

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.mm

@@ -19,7 +19,7 @@ static const NSUInteger bufferSize = 500;
 @interface SKBufferingPlugin()
 
 @property(assign, nonatomic) std::vector<CachedEvent> ringBuffer;
-@property(assign, nonatomic) std::shared_ptr<facebook::sonar::DispatchQueue> connectionAccessQueue;
+@property(assign, nonatomic) std::shared_ptr<facebook::flipper::DispatchQueue> connectionAccessQueue;
 @property(strong, nonatomic) id<SonarConnection> connection;
 
 @end
@@ -27,7 +27,7 @@ static const NSUInteger bufferSize = 500;
 @implementation SKBufferingPlugin
 // {
 //   std::vector<CachedEvent> _ringBuffer;
-//   std::shared_ptr<facebook::sonar::DispatchQueue> _connectionAccessQueue;
+//   std::shared_ptr<facebook::flipper::DispatchQueue> _connectionAccessQueue;
 //
 //   id<SonarConnection> _connection;
 // }
@@ -35,7 +35,7 @@ static const NSUInteger bufferSize = 500;
 - (instancetype)initWithQueue:(dispatch_queue_t)queue {
   if (self = [super init]) {
     _ringBuffer.reserve(bufferSize);
-    _connectionAccessQueue = std::make_shared<facebook::sonar::GCDQueue>(queue);
+    _connectionAccessQueue = std::make_shared<facebook::flipper::GCDQueue>(queue);
   }
   return self;
 }
@@ -87,14 +87,14 @@ static const NSUInteger bufferSize = 500;
 
 @implementation SKBufferingPlugin(CPPInitialization)
 
-- (instancetype)initWithVectorEventSize:(NSUInteger)size connectionAccessQueue:(std::shared_ptr<facebook::sonar::DispatchQueue>)connectionAccessQueue {
+- (instancetype)initWithVectorEventSize:(NSUInteger)size connectionAccessQueue:(std::shared_ptr<facebook::flipper::DispatchQueue>)connectionAccessQueue {
     if (self = [super init]) {
       _ringBuffer.reserve(size);
       _connectionAccessQueue = connectionAccessQueue;
     }
     return self;
 }
-- (instancetype)initWithDispatchQueue:(std::shared_ptr<facebook::sonar::DispatchQueue>)queue {
+- (instancetype)initWithDispatchQueue:(std::shared_ptr<facebook::flipper::DispatchQueue>)queue {
     return [self initWithVectorEventSize:bufferSize
                       connectionAccessQueue:queue];
 

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h

@@ -12,7 +12,7 @@
 #import <dispatch/dispatch.h>
 
 namespace facebook {
-  namespace sonar {
+  namespace flipper {
     class DispatchQueue
     {
     public:

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin+CPPInitialization.h

@@ -13,6 +13,6 @@
 #import <memory>
 
 @interface SonarKitNetworkPlugin(CPPInitialization)
-- (instancetype)initWithNetworkAdapter:(id<SKNetworkAdapterDelegate>)adapter dispatchQueue:(std::shared_ptr<facebook::sonar::DispatchQueue>)queue;
+- (instancetype)initWithNetworkAdapter:(id<SKNetworkAdapterDelegate>)adapter dispatchQueue:(std::shared_ptr<facebook::flipper::DispatchQueue>)queue;
 @end
 #endif

iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.mm

@@ -106,7 +106,7 @@
 
 @implementation SonarKitNetworkPlugin (CPPInitialization)
 
-- (instancetype)initWithNetworkAdapter:(id<SKNetworkAdapterDelegate>)adapter dispatchQueue:(std::shared_ptr<facebook::sonar::DispatchQueue>)queue {
+- (instancetype)initWithNetworkAdapter:(id<SKNetworkAdapterDelegate>)adapter dispatchQueue:(std::shared_ptr<facebook::flipper::DispatchQueue>)queue {
     if (self = [super initWithDispatchQueue:queue]) {
       adapter.delegate = self;
       _adapter = adapter;

iOS/Sample/Podfile.lock

@@ -16,36 +16,36 @@ PODS:
   - PeerTalk (0.0.2)
   - RSocket (0.10.0):
     - Folly
-  - Sonar (0.6.16):
+  - Sonar (0.7.0):
     - Folly (~> 1.1)
     - RSocket (~> 0.10)
-  - SonarKit (0.6.16):
-    - SonarKit/Core (= 0.6.16)
-  - SonarKit/Core (0.6.16):
+  - SonarKit (0.7.0):
+    - SonarKit/Core (= 0.7.0)
+  - SonarKit/Core (0.7.0):
     - CocoaAsyncSocket (~> 7.6)
     - Folly (~> 1.1)
     - OpenSSL-Static (= 1.0.2.c1)
     - PeerTalk (~> 0.0.2)
-    - Sonar (~> 0.6.16)
+    - Sonar (~> 0.7.0)
     - SonarKit/CppBridge
     - SonarKit/FBCxxUtils
     - SonarKit/FBDefines
-  - SonarKit/CppBridge (0.6.16)
-  - SonarKit/FBCxxUtils (0.6.16)
-  - SonarKit/FBDefines (0.6.16)
-  - SonarKit/SKIOSNetworkPlugin (0.6.16):
+  - SonarKit/CppBridge (0.7.0)
+  - SonarKit/FBCxxUtils (0.7.0)
+  - SonarKit/FBDefines (0.7.0)
+  - SonarKit/SKIOSNetworkPlugin (0.7.0):
     - SonarKit/Core
     - SonarKit/SonarKitNetworkPlugin
-  - SonarKit/SonarKitLayoutComponentKitSupport (0.6.16):
+  - SonarKit/SonarKitLayoutComponentKitSupport (0.7.0):
     - ComponentKit
     - SonarKit/Core
     - SonarKit/SonarKitLayoutPlugin
     - Yoga (~> 1.9)
-  - SonarKit/SonarKitLayoutPlugin (0.6.16):
+  - SonarKit/SonarKitLayoutPlugin (0.7.0):
     - SonarKit/Core
     - Yoga (~> 1.9)
     - YogaKit (~> 1.8)
-  - SonarKit/SonarKitNetworkPlugin (0.6.16):
+  - SonarKit/SonarKitNetworkPlugin (0.7.0):
     - SonarKit/Core
   - Yoga (1.9.0)
   - YogaKit (1.9.0):
@@ -90,11 +90,11 @@ SPEC CHECKSUMS:
   OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
   PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
   RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
-  Sonar: 74d1e3a853f1453511108ac1b3e7469a2b2ade92
-  SonarKit: 99c7f51f670c6203c225f509ca5b6f85c6ce734a
+  Sonar: 3ce26a113ca4cf69e0d784c22ca605708ee657ee
+  SonarKit: 924c28d0c1d5ef830d79cd71c934b3710daeb767
   Yoga: aaae8abea68951f60bee05f6277d3eed90bb91bb
   YogaKit: d447a9bb808718e6f58e52a2255a8050081a3ead
 
 PODFILE CHECKSUM: b1786f878ef1a53893b6a0f9d79d4987b72bc916
 
-COCOAPODS: 1.5.2
+COCOAPODS: 1.5.3

iOS/SonarKit/CppBridge/SonarCppBridgingConnection.h

@@ -14,5 +14,5 @@ that forwards messages to the underlying C++ connection. This class allows
 pure Objective-C plugins to send messages to the underlying connection.
 */
 @interface SonarCppBridgingConnection : NSObject <SonarConnection>
-- (instancetype)initWithCppConnection:(std::shared_ptr<facebook::sonar::SonarConnection>)conn;
+- (instancetype)initWithCppConnection:(std::shared_ptr<facebook::flipper::SonarConnection>)conn;
 @end

iOS/SonarKit/CppBridge/SonarCppBridgingConnection.mm

@@ -13,10 +13,10 @@
 
 @implementation SonarCppBridgingConnection
 {
-  std::shared_ptr<facebook::sonar::SonarConnection> conn_;
+  std::shared_ptr<facebook::flipper::SonarConnection> conn_;
 }
 
-- (instancetype)initWithCppConnection:(std::shared_ptr<facebook::sonar::SonarConnection>)conn
+- (instancetype)initWithCppConnection:(std::shared_ptr<facebook::flipper::SonarConnection>)conn
 {
   if (self = [super init]) {
     conn_ = conn;
@@ -34,7 +34,7 @@
 - (void)receive:(NSString *)method withBlock:(SonarReceiver)receiver
 {
     const auto lambda = [receiver](const folly::dynamic &message,
-                                   std::unique_ptr<facebook::sonar::SonarResponder> responder) {
+                                   std::unique_ptr<facebook::flipper::SonarResponder> responder) {
       @autoreleasepool {
         SonarCppBridgingResponder *const objCResponder =
         [[SonarCppBridgingResponder alloc] initWithCppResponder:std::move(responder)];

iOS/SonarKit/CppBridge/SonarCppBridgingResponder.h

@@ -14,5 +14,5 @@ that forwards messages to the underlying C++ responder. This class allows
 pure Objective-C plugins to send messages to the underlying responder.
 */
 @interface SonarCppBridgingResponder : NSObject <SonarResponder>
-- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::sonar::SonarResponder>)responder;
+- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::SonarResponder>)responder;
 @end

iOS/SonarKit/CppBridge/SonarCppBridgingResponder.mm

@@ -10,10 +10,10 @@
 #import <FBCxxUtils/FBCxxFollyDynamicConvert.h>
 
 @implementation SonarCppBridgingResponder {
-  std::unique_ptr<facebook::sonar::SonarResponder> responder_;
+  std::unique_ptr<facebook::flipper::SonarResponder> responder_;
 }
 
-- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::sonar::SonarResponder>)responder
+- (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::SonarResponder>)responder
 {
   if (!responder) {
     return nil;

iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h

@@ -14,7 +14,7 @@
 #import <SonarKit/SonarPlugin.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 using ObjCPlugin = NSObject<SonarPlugin> *;
 
@@ -23,14 +23,14 @@ 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::sonar::SonarPlugin {
+class SonarCppWrapperPlugin final : public facebook::flipper::SonarPlugin {
 public:
   // Under ARC copying objCPlugin *does* increment its retain count
   SonarCppWrapperPlugin(ObjCPlugin objCPlugin) : _objCPlugin(objCPlugin) {}
 
   std::string identifier() const override { return [[_objCPlugin identifier] UTF8String]; }
 
-  void didConnect(std::shared_ptr<facebook::sonar::SonarConnection> conn) override
+  void didConnect(std::shared_ptr<facebook::flipper::SonarConnection> conn) override
   {
     SonarCppBridgingConnection *const bridgingConn = [[SonarCppBridgingConnection alloc] initWithCppConnection:conn];
     [_objCPlugin didConnect:bridgingConn];
@@ -44,5 +44,5 @@ private:
   ObjCPlugin _objCPlugin;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

iOS/SonarKit/SonarClient.mm

@@ -20,10 +20,10 @@
 //#import "SKPortForwardingServer.h"
 #endif
 
-using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
+using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin;
 
 @implementation SonarClient {
-  facebook::sonar::SonarClient *_cppClient;
+  facebook::flipper::SonarClient *_cppClient;
   folly::ScopedEventBaseThread sonarThread;
   folly::ScopedEventBaseThread connectionThread;
 #if !TARGET_OS_SIMULATOR
@@ -61,7 +61,7 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
     deviceName = [NSString stringWithFormat:@"%@ %@", [[UIDevice currentDevice] model], @"Simulator"];
 #endif
 
-    facebook::sonar::SonarClient::init({
+    facebook::flipper::SonarClient::init({
       {
         "localhost",
         "iOS",
@@ -74,7 +74,7 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
       sonarThread.getEventBase(),
       connectionThread.getEventBase()
     });
-    _cppClient = facebook::sonar::SonarClient::instance();
+    _cppClient = facebook::flipper::SonarClient::instance();
   }
   return self;
 }
@@ -129,19 +129,19 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
 - (NSArray *)getStateElements {
   NSMutableArray<NSDictionary<NSString *, NSString *>*> *const array = [NSMutableArray array];
 
-  for (facebook::sonar::StateElement element: _cppClient->getStateElements()) {
-    facebook::sonar::State state = element.state_;
+  for (facebook::flipper::StateElement element: _cppClient->getStateElements()) {
+    facebook::flipper::State state = element.state_;
     NSString *stateString;
     switch (state) {
-      case facebook::sonar::in_progress:
+      case facebook::flipper::in_progress:
         stateString = @"⏳ ";
         break;
 
-      case facebook::sonar::success:
+      case facebook::flipper::success:
         stateString = @"✅ ";
         break;
 
-      case facebook::sonar::failed:
+      case facebook::flipper::failed:
         stateString = @"❌ ";
         break;
 

iOS/SonarKitTestUtils/SonarClient+Testing.h

@@ -16,6 +16,6 @@
 
 @interface SonarClient (Testing)
 
-- (instancetype)initWithCppClient:(facebook::sonar::SonarClient *)cppClient;
+- (instancetype)initWithCppClient:(facebook::flipper::SonarClient *)cppClient;
 
 @end

iOS/SonarKitTests/SonarCppBridgingTests.mm

@@ -12,7 +12,7 @@
 #import <SonarKit/CppBridge/SonarCppWrapperPlugin.h>
 #import <SonarKit/SonarPlugin.h>
 
-using facebook::sonar::SonarCppWrapperPlugin;
+using facebook::flipper::SonarCppWrapperPlugin;
 
 @interface DummyPlugin : NSObject <SonarPlugin>
 @end

xplat/Sonar/ConnectionContextStore.cpp

@@ -6,7 +6,7 @@
 #include "CertificateUtils.h"
 #include "Log.h"
 
-using namespace facebook::sonar;
+using namespace facebook::flipper;
 
 static constexpr auto CSR_FILE_NAME = "app.csr";
 static constexpr auto FLIPPER_CA_FILE_NAME = "flipperCA.crt";

xplat/Sonar/ConnectionContextStore.h

@@ -8,7 +8,7 @@
 using namespace folly;
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class ConnectionContextStore {
 
@@ -29,5 +29,5 @@ private:
 
 };
 
-} // namespace sonar
+} // namespace flipper
 } //namespace facebook

xplat/Sonar/Log.cpp

@@ -5,7 +5,7 @@
 #endif
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
   void log(const std::string& message) {
   #ifdef __ANDROID__
@@ -16,5 +16,5 @@ namespace sonar {
   }
 
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/Log.h

@@ -3,9 +3,9 @@
 #include <string>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
   void log(const std::string& message);
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarClient.cpp

@@ -19,7 +19,7 @@
 #if FB_SONARKIT_ENABLED
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 static SonarClient* kInstance;
 
@@ -214,7 +214,7 @@ std::vector<StateElement> SonarClient::getStateElements() {
   return sonarState_->getStateElements();
 }
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook
 
 #endif

xplat/Sonar/SonarClient.h

@@ -19,7 +19,7 @@
 #include <vector>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarClient : public SonarWebSocket::Callbacks {
  public:
@@ -100,5 +100,5 @@ class SonarClient : public SonarWebSocket::Callbacks {
   void disconnect(std::shared_ptr<SonarPlugin> plugin);
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarConnection.h

@@ -14,7 +14,7 @@
 #include <string>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 /**
 Represents a connection between the Desktop and mobile plugins
@@ -50,5 +50,5 @@ class SonarConnection {
       const SonarReceiver& receiver) = 0;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarConnectionImpl.h

@@ -14,7 +14,7 @@
 #include <string>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarConnectionImpl : public SonarConnection {
  public:
@@ -57,5 +57,5 @@ class SonarConnectionImpl : public SonarConnection {
   std::map<std::string, SonarReceiver> receivers_;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarInitConfig.h

@@ -12,7 +12,7 @@
 #include <map>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 struct DeviceData {
   std::string host;
@@ -41,5 +41,5 @@ struct SonarInitConfig {
   folly::EventBase* connectionWorker;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarPlugin.h

@@ -11,7 +11,7 @@
 #include <string>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarPlugin {
  public:
@@ -38,5 +38,5 @@ class SonarPlugin {
   virtual void didDisconnect() = 0;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarResponder.h

@@ -11,7 +11,7 @@
 #include <folly/json.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 /**
  * SonarResponder is used to asynchronously respond to messages
@@ -32,5 +32,5 @@ class SonarResponder {
   virtual void error(const folly::dynamic& response) const = 0;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarResponderImpl.h

@@ -13,7 +13,7 @@
 #include <folly/json.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarResponderImpl : public SonarResponder {
  public:
@@ -37,5 +37,5 @@ class SonarResponderImpl : public SonarResponder {
   int64_t responseID_;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarState.cpp

@@ -10,7 +10,7 @@
 #include "SonarStep.h"
 #include <vector>
 
-using namespace facebook::sonar;
+using namespace facebook::flipper;
 
 /* Class responsible for collecting state updates and combining them into a
  * view of the current state of the sonar client. */

xplat/Sonar/SonarState.h

@@ -17,7 +17,7 @@ class SonarStep;
 class SonarStateUpdateListener;
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 enum State { success, in_progress, failed };
 
@@ -38,7 +38,7 @@ class SonarState {
   SonarState();
   void setUpdateListener(std::shared_ptr<SonarStateUpdateListener>);
   std::string getState();
-  std::vector<facebook::sonar::StateElement> getStateElements();
+  std::vector<facebook::flipper::StateElement> getStateElements();
 
   /* To record a state update, call start() with the name of the step to get a
    SonarStep object. Call complete on this to register it successful,
@@ -54,5 +54,5 @@ class SonarState {
   std::shared_ptr<SonarStateUpdateListener> mListener = nullptr;
   std::string log;
   std::vector<std::string> insertOrder;
-  std::map<std::string, facebook::sonar::State> stateMap;
+  std::map<std::string, facebook::flipper::State> stateMap;
 };

xplat/Sonar/SonarWebSocket.h

@@ -11,7 +11,7 @@
 #include <folly/json.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarWebSocket {
  public:
@@ -59,5 +59,5 @@ class SonarWebSocket::Callbacks {
   virtual void onMessageReceived(const folly::dynamic& message) = 0;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarWebSocketImpl.cpp

@@ -30,7 +30,7 @@ static constexpr int securePort = 8088;
 static constexpr int insecurePort = 8089;
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class ConnectionEvents : public rsocket::RSocketConnectionEvents {
  private:
@@ -301,5 +301,5 @@ bool SonarWebSocketImpl::isRunningInOwnThread() {
   return sonarEventBase_->isInEventBaseThread();
 }
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/Sonar/SonarWebSocketImpl.h

@@ -17,7 +17,7 @@
 #include <mutex>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class ConnectionEvents;
 class ConnectionContextStore;
@@ -67,5 +67,5 @@ class SonarWebSocketImpl : public SonarWebSocket {
   std::string getDeviceId();
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/SonarTestLib/ConnectionContextStoreMock.h

@@ -1,7 +1,7 @@
 #include <Sonar/ConnectionContextStore.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 namespace test {
 
   class ConnectionContextStoreMock : public ConnectionContextStore {

xplat/SonarTestLib/SonarConnectionMock.h

@@ -13,7 +13,7 @@
 #include <string>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarConnectionMock : public SonarConnection {
  public:
@@ -33,5 +33,5 @@ class SonarConnectionMock : public SonarConnection {
   std::map<std::string, SonarReceiver> receivers_;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/SonarTestLib/SonarPluginMock.h

@@ -11,7 +11,7 @@
 #include <Sonar/SonarPlugin.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 namespace test {
 
 class SonarPluginMock : public SonarPlugin {
@@ -58,5 +58,5 @@ class SonarPluginMock : public SonarPlugin {
 };
 
 } // namespace test
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/SonarTestLib/SonarResponderMock.h

@@ -13,7 +13,7 @@
 #include <vector>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 
 class SonarResponderMock : public SonarResponder {
  public:
@@ -39,5 +39,5 @@ class SonarResponderMock : public SonarResponder {
   std::vector<folly::dynamic>* errors_;
 };
 
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/SonarTestLib/SonarWebSocketMock.h

@@ -11,7 +11,7 @@
 #include <Sonar/SonarWebSocket.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 namespace test {
 
 class SonarWebSocketMock : public SonarWebSocket {
@@ -51,5 +51,5 @@ class SonarWebSocketMock : public SonarWebSocket {
 };
 
 } // namespace test
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/SonarTests/SonarClientTests.cpp

@@ -14,7 +14,7 @@
 #include <gtest/gtest.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 namespace test {
 
 using folly::dynamic;
@@ -290,5 +290,5 @@ TEST(SonarClientTests, testExceptionUnknownApi) {
 }
 
 } // namespace test
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook

xplat/SonarTests/SonarWebSocketImplTerminationTests.cpp

@@ -12,7 +12,7 @@
 #include <gtest/gtest.h>
 
 namespace facebook {
-namespace sonar {
+namespace flipper {
 namespace test {
 
 using folly::EventBase;
@@ -95,5 +95,5 @@ TEST_F(SonarWebSocketImplTerminationTest, testStartedEventBaseDoesntHang) {
 }
 
 } // namespace test
-} // namespace sonar
+} // namespace flipper
 } // namespace facebook