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

Rename facebook::sonar namespace

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

Reviewed By: passy

Differential Revision: D9861393

Pulled By: jknoxville

fbshipit-source-id: d65f751c35028748915023f33f273d6ec45863c8
This commit is contained in:
John Knox
2018-09-18 07:16:54 -07:00
committed by Facebook Github Bot
parent 159ce69bc8
commit a480be90a2
40 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin+CPPInitialization.h
View File

@@ -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

10
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.mm
View File

@@ -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];

2
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h
View File

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

2
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin+CPPInitialization.h
View File

@@ -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

2
iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.mm
View File

@@ -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;

30
iOS/Sample/Podfile.lock
View File

@@ -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

2
iOS/SonarKit/CppBridge/SonarCppBridgingConnection.h
View File

@@ -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

6
iOS/SonarKit/CppBridge/SonarCppBridgingConnection.mm
View File

@@ -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)];

2
iOS/SonarKit/CppBridge/SonarCppBridgingResponder.h
View File

@@ -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

4
iOS/SonarKit/CppBridge/SonarCppBridgingResponder.mm
View File

@@ -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;

8
iOS/SonarKit/CppBridge/SonarCppWrapperPlugin.h
View File

@@ -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

18
iOS/SonarKit/SonarClient.mm
View File

@@ -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;

2
iOS/SonarKitTestUtils/SonarClient+Testing.h
View File

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

2
iOS/SonarKitTests/SonarCppBridgingTests.mm
View File

@@ -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