From c315691b2d67752e843b52551b17674dcc83b457 Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Tue, 11 Feb 2020 19:27:40 -0800 Subject: [PATCH] Apply clang-format Differential Revision: D19843069 fbshipit-source-id: af3f3998e2259ca5070b43ffb19933cf9304319d --- android/src/main/cpp/sonar.cpp | 188 ++++++++++++------ xplat/Flipper/CertificateUtils.cpp | 4 +- xplat/Flipper/ConnectionContextStore.h | 7 +- xplat/Flipper/FlipperConnection.h | 2 +- xplat/Flipper/FlipperConnectionImpl.h | 4 +- xplat/Flipper/FlipperPlugin.h | 5 +- xplat/Flipper/Log.cpp | 16 +- xplat/Flipper/Log.h | 2 +- .../ConnectionContextStoreMock.h | 43 ++-- ...rConnectionManagerImplTerminationTests.cpp | 68 +++---- 10 files changed, 195 insertions(+), 144 deletions(-) diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index 30013f457..6ed10ead3 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -13,16 +13,16 @@ #include #endif -#include #include #include +#include #include -#include #include +#include #include -#include #include +#include using namespace facebook; using namespace facebook::flipper; @@ -37,7 +37,8 @@ void handleException(const std::exception& e) { class JEventBase : public jni::HybridClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/EventBase;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/android/EventBase;"; static void registerNatives() { registerHybrid({ @@ -69,86 +70,113 @@ class JEventBase : public jni::HybridClass { class JFlipperObject : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperObject;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperObject;"; static jni::local_ref create(const folly::dynamic& json) { return newInstance(folly::toJson(json)); } std::string toJsonString() { - static const auto method = javaClassStatic()->getMethod("toJsonString"); + static const auto method = + javaClassStatic()->getMethod("toJsonString"); return method(self())->toStdString(); } }; class JFlipperArray : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperArray;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperArray;"; static jni::local_ref create(const folly::dynamic& json) { return newInstance(folly::toJson(json)); } std::string toJsonString() { - static const auto method = javaClassStatic()->getMethod("toJsonString"); + static const auto method = + javaClassStatic()->getMethod("toJsonString"); return method(self())->toStdString(); } }; class JFlipperResponder : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperResponder;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperResponder;"; }; -class JFlipperResponderImpl : public jni::HybridClass { +class JFlipperResponderImpl + : public jni::HybridClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperResponderImpl;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/android/FlipperResponderImpl;"; static void registerNatives() { registerHybrid({ - makeNativeMethod("successObject", JFlipperResponderImpl::successObject), - makeNativeMethod("successArray", JFlipperResponderImpl::successArray), - makeNativeMethod("error", JFlipperResponderImpl::error), + makeNativeMethod("successObject", JFlipperResponderImpl::successObject), + makeNativeMethod("successArray", JFlipperResponderImpl::successArray), + makeNativeMethod("error", JFlipperResponderImpl::error), }); } void successObject(jni::alias_ref json) { - _responder->success(json ? folly::parseJson(json->toJsonString()) : folly::dynamic::object()); + _responder->success( + json ? folly::parseJson(json->toJsonString()) + : folly::dynamic::object()); } void successArray(jni::alias_ref json) { - _responder->success(json ? folly::parseJson(json->toJsonString()) : folly::dynamic::object()); + _responder->success( + json ? folly::parseJson(json->toJsonString()) + : folly::dynamic::object()); } void error(jni::alias_ref json) { - _responder->error(json ? folly::parseJson(json->toJsonString()) : folly::dynamic::object()); + _responder->error( + json ? folly::parseJson(json->toJsonString()) + : folly::dynamic::object()); } private: friend HybridBase; std::shared_ptr _responder; - JFlipperResponderImpl(std::shared_ptr responder): _responder(std::move(responder)) {} + JFlipperResponderImpl(std::shared_ptr responder) + : _responder(std::move(responder)) {} }; class JFlipperReceiver : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperReceiver;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperReceiver;"; - void receive(const folly::dynamic params, std::shared_ptr responder) const { - static const auto method = javaClassStatic()->getMethod, jni::alias_ref)>("onReceive"); - method(self(), JFlipperObject::create(std::move(params)), JFlipperResponderImpl::newObjectCxxArgs(responder)); + void receive( + const folly::dynamic params, + std::shared_ptr responder) const { + static const auto method = + javaClassStatic() + ->getMethod, + jni::alias_ref)>("onReceive"); + method( + self(), + JFlipperObject::create(std::move(params)), + JFlipperResponderImpl::newObjectCxxArgs(responder)); } }; class JFlipperConnection : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperConnection;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperConnection;"; }; -class JFlipperConnectionImpl : public jni::HybridClass { +class JFlipperConnectionImpl + : public jni::HybridClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperConnectionImpl;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/android/FlipperConnectionImpl;"; static void registerNatives() { registerHybrid({ @@ -162,12 +190,20 @@ class JFlipperConnectionImpl : public jni::HybridClass json) { - _connection->send(std::move(method), json ? folly::parseJson(json->toJsonString()) : folly::dynamic::object()); + void sendObject( + const std::string method, + jni::alias_ref json) { + _connection->send( + std::move(method), + json ? folly::parseJson(json->toJsonString()) + : folly::dynamic::object()); } void sendArray(const std::string method, jni::alias_ref json) { - _connection->send(std::move(method), json ? folly::parseJson(json->toJsonString()) : folly::dynamic::object()); + _connection->send( + std::move(method), + json ? folly::parseJson(json->toJsonString()) + : folly::dynamic::object()); } void reportErrorWithMetadata( @@ -181,26 +217,35 @@ class JFlipperConnectionImpl : public jni::HybridClasstoString(), throwable->getStackTrace()->toString()); } - void receive(const std::string method, jni::alias_ref receiver) { + void receive( + const std::string method, + jni::alias_ref receiver) { auto global = make_global(receiver); - _connection->receive(std::move(method), [global] (const folly::dynamic& params, std::shared_ptr responder) { - global->receive(params, responder); - }); + _connection->receive( + std::move(method), + [global]( + const folly::dynamic& params, + std::shared_ptr responder) { + global->receive(params, responder); + }); } private: friend HybridBase; std::shared_ptr _connection; - JFlipperConnectionImpl(std::shared_ptr connection): _connection(std::move(connection)) {} + JFlipperConnectionImpl(std::shared_ptr connection) + : _connection(std::move(connection)) {} }; class JFlipperPlugin : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperPlugin;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperPlugin;"; std::string identifier() const { - static const auto method = javaClassStatic()->getMethod("getId"); + static const auto method = + javaClassStatic()->getMethod("getId"); try { return method(self())->toStdString(); @@ -232,7 +277,8 @@ class JFlipperPlugin : public jni::JavaClass { } void didDisconnect() { - static const auto method = javaClassStatic()->getMethod("onDisconnect"); + static const auto method = + javaClassStatic()->getMethod("onDisconnect"); try { method(self()); } catch (const std::exception& e) { @@ -244,26 +290,28 @@ class JFlipperPlugin : public jni::JavaClass { } } - bool runInBackground() { - static const auto method = - javaClassStatic()->getMethod("runInBackground"); - try { - return method(self()) == JNI_TRUE; - } catch (const std::exception& e) { - handleException(e); - return false; - } catch (const std::exception* e) { - if (e) { - handleException(*e); - } - return false; + bool runInBackground() { + static const auto method = + javaClassStatic()->getMethod("runInBackground"); + try { + return method(self()) == JNI_TRUE; + } catch (const std::exception& e) { + handleException(e); + return false; + } catch (const std::exception* e) { + if (e) { + handleException(*e); } + return false; } + } }; -class JFlipperStateUpdateListener : public jni::JavaClass { +class JFlipperStateUpdateListener + : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperStateUpdateListener;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/FlipperStateUpdateListener;"; void onUpdate() { try { @@ -322,11 +370,12 @@ class JFlipperStateUpdateListener : public jni::JavaClass stateListener); + AndroidFlipperStateUpdateListener( + jni::alias_ref stateListener); void onUpdate(); - private: - jni::global_ref jStateListener; + private: + jni::global_ref jStateListener; }; class JFlipperPluginWrapper : public FlipperPlugin { @@ -345,31 +394,35 @@ class JFlipperPluginWrapper : public FlipperPlugin { jplugin->didDisconnect(); } - virtual bool runInBackground() override { - return jplugin->runInBackground(); - } + virtual bool runInBackground() override { + return jplugin->runInBackground(); + } - JFlipperPluginWrapper(jni::global_ref plugin): jplugin(plugin) {} + JFlipperPluginWrapper(jni::global_ref plugin) + : jplugin(plugin) {} }; struct JStateSummary : public jni::JavaClass { -public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/StateSummary;"; + public: + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/core/StateSummary;"; static jni::local_ref create() { return newInstance(); } void addEntry(std::string name, std::string state) { - static const auto method = javaClassStatic()->getMethod("addEntry"); + static const auto method = + javaClassStatic()->getMethod( + "addEntry"); return method(self(), name, state); } - }; class JFlipperClient : public jni::HybridClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperClientImpl;"; + constexpr static auto kJavaDescriptor = + "Lcom/facebook/flipper/android/FlipperClientImpl;"; static void registerNatives() { registerHybrid({ @@ -388,7 +441,8 @@ class JFlipperClient : public jni::HybridClass { }); } - static jni::alias_ref getInstance(jni::alias_ref) { + static jni::alias_ref getInstance( + jni::alias_ref) { try { static auto client = make_global(newObjectCxxArgs()); return client; @@ -448,7 +502,8 @@ class JFlipperClient : public jni::HybridClass { } } - void subscribeForUpdates(jni::alias_ref stateListener) { + void subscribeForUpdates( + jni::alias_ref stateListener) { try { auto client = FlipperClient::instance(); mStateListener = @@ -585,7 +640,8 @@ jint JNI_OnLoad(JavaVM* vm, void*) { }); } -AndroidFlipperStateUpdateListener::AndroidFlipperStateUpdateListener(jni::alias_ref stateListener) { +AndroidFlipperStateUpdateListener::AndroidFlipperStateUpdateListener( + jni::alias_ref stateListener) { jStateListener = jni::make_global(stateListener); } diff --git a/xplat/Flipper/CertificateUtils.cpp b/xplat/Flipper/CertificateUtils.cpp index 2e6fa258d..1e81f721c 100644 --- a/xplat/Flipper/CertificateUtils.cpp +++ b/xplat/Flipper/CertificateUtils.cpp @@ -8,10 +8,10 @@ #include "CertificateUtils.h" #include +#include +#include #include #include -#include -#include #include void free( diff --git a/xplat/Flipper/ConnectionContextStore.h b/xplat/Flipper/ConnectionContextStore.h index bb4baa9bb..bad971481 100644 --- a/xplat/Flipper/ConnectionContextStore.h +++ b/xplat/Flipper/ConnectionContextStore.h @@ -7,9 +7,9 @@ #pragma once -#include -#include #include +#include +#include #include "FlipperInitConfig.h" using namespace folly; @@ -18,8 +18,7 @@ namespace facebook { namespace flipper { class ConnectionContextStore { - -public: + public: ConnectionContextStore(DeviceData deviceData); bool hasRequiredFiles(); std::string getCertificateSigningRequest(); diff --git a/xplat/Flipper/FlipperConnection.h b/xplat/Flipper/FlipperConnection.h index 5cbc9b68a..cbb4daa58 100644 --- a/xplat/Flipper/FlipperConnection.h +++ b/xplat/Flipper/FlipperConnection.h @@ -7,10 +7,10 @@ #pragma once -#include "FlipperResponder.h" #include #include #include +#include "FlipperResponder.h" namespace facebook { namespace flipper { diff --git a/xplat/Flipper/FlipperConnectionImpl.h b/xplat/Flipper/FlipperConnectionImpl.h index 7d757a29d..adb0d1b7a 100644 --- a/xplat/Flipper/FlipperConnectionImpl.h +++ b/xplat/Flipper/FlipperConnectionImpl.h @@ -18,7 +18,9 @@ namespace flipper { class FlipperConnectionImpl : public FlipperConnection { public: - FlipperConnectionImpl(FlipperConnectionManager* socket, const std::string& name) + FlipperConnectionImpl( + FlipperConnectionManager* socket, + const std::string& name) : socket_(socket), name_(name) {} void call( diff --git a/xplat/Flipper/FlipperPlugin.h b/xplat/Flipper/FlipperPlugin.h index 3e08ede6d..5f96aea16 100644 --- a/xplat/Flipper/FlipperPlugin.h +++ b/xplat/Flipper/FlipperPlugin.h @@ -7,8 +7,8 @@ #pragma once -#include "FlipperConnection.h" #include +#include "FlipperConnection.h" namespace facebook { namespace flipper { @@ -38,7 +38,8 @@ class FlipperPlugin { virtual void didDisconnect() = 0; /** - Returns true if the plugin is meant to be run in background too, otherwise it returns false. + Returns true if the plugin is meant to be run in background too, otherwise it + returns false. */ virtual bool runInBackground() { return false; diff --git a/xplat/Flipper/Log.cpp b/xplat/Flipper/Log.cpp index c4b2a5681..5332918df 100644 --- a/xplat/Flipper/Log.cpp +++ b/xplat/Flipper/Log.cpp @@ -14,14 +14,14 @@ namespace facebook { namespace flipper { - void log(const std::string& message) { - #ifdef __ANDROID__ - __android_log_print(ANDROID_LOG_INFO, "flipper", "flipper: %s", message.c_str()); - #else - printf("flipper: %s\n", message.c_str()); - #endif - } - +void log(const std::string& message) { +#ifdef __ANDROID__ + __android_log_print( + ANDROID_LOG_INFO, "flipper", "flipper: %s", message.c_str()); +#else + printf("flipper: %s\n", message.c_str()); +#endif +} } // namespace flipper } // namespace facebook diff --git a/xplat/Flipper/Log.h b/xplat/Flipper/Log.h index 8d14ce342..ce181ca66 100644 --- a/xplat/Flipper/Log.h +++ b/xplat/Flipper/Log.h @@ -12,7 +12,7 @@ namespace facebook { namespace flipper { - void log(const std::string& message); +void log(const std::string& message); } // namespace flipper } // namespace facebook diff --git a/xplat/FlipperTestLib/ConnectionContextStoreMock.h b/xplat/FlipperTestLib/ConnectionContextStoreMock.h index a15f22543..8917b2b3a 100644 --- a/xplat/FlipperTestLib/ConnectionContextStoreMock.h +++ b/xplat/FlipperTestLib/ConnectionContextStoreMock.h @@ -11,25 +11,26 @@ namespace facebook { namespace flipper { namespace test { - class ConnectionContextStoreMock : public ConnectionContextStore { - public: - ConnectionContextStoreMock() : ConnectionContextStore(DeviceData()) { - } - bool hasRequiredFiles() { - return true; - } - std::string createCertificateSigningRequest() { - return "thisIsACsr"; - } - std::shared_ptr getSSLContext() { - return nullptr; - } - dynamic getConnectionConfig() { - return nullptr; - } - std::string getCertificateDirectoryPath() { - return "/something/sonar/"; - } - }; +class ConnectionContextStoreMock : public ConnectionContextStore { + public: + ConnectionContextStoreMock() : ConnectionContextStore(DeviceData()) {} + bool hasRequiredFiles() { + return true; + } + std::string createCertificateSigningRequest() { + return "thisIsACsr"; + } + std::shared_ptr getSSLContext() { + return nullptr; + } + dynamic getConnectionConfig() { + return nullptr; + } + std::string getCertificateDirectoryPath() { + return "/something/sonar/"; + } +}; -}}} +} // namespace test +} // namespace flipper +} // namespace facebook diff --git a/xplat/FlipperTests/FlipperConnectionManagerImplTerminationTests.cpp b/xplat/FlipperTests/FlipperConnectionManagerImplTerminationTests.cpp index e0f01060a..028fbbe69 100644 --- a/xplat/FlipperTests/FlipperConnectionManagerImplTerminationTests.cpp +++ b/xplat/FlipperTests/FlipperConnectionManagerImplTerminationTests.cpp @@ -18,7 +18,7 @@ namespace test { using folly::EventBase; class FlipperConnectionManagerImplTerminationTest : public ::testing::Test { -protected: + protected: std::shared_ptr state; std::shared_ptr contextStore; void SetUp() override { @@ -30,60 +30,52 @@ protected: } }; -TEST_F(FlipperConnectionManagerImplTerminationTest, testNullEventBaseGetsRejected) { +TEST_F( + FlipperConnectionManagerImplTerminationTest, + testNullEventBaseGetsRejected) { try { - auto instance = std::make_shared(FlipperInitConfig { - DeviceData {}, - nullptr, - new EventBase() - }, - state, - contextStore - ); + auto instance = std::make_shared( + FlipperInitConfig{DeviceData{}, nullptr, new EventBase()}, + state, + contextStore); FAIL(); } catch (std::invalid_argument& e) { // Pass test } try { - auto instance = std::make_shared(FlipperInitConfig { - DeviceData {}, - new EventBase(), - nullptr - }, - state, - contextStore - ); + auto instance = std::make_shared( + FlipperInitConfig{DeviceData{}, new EventBase(), nullptr}, + state, + contextStore); FAIL(); } catch (std::invalid_argument& e) { // Pass test } } -TEST_F(FlipperConnectionManagerImplTerminationTest, testNonStartedEventBaseDoesntHang) { - auto config = FlipperInitConfig { - DeviceData {}, - new EventBase(), - new EventBase() - }; - auto instance = std::make_shared(config, state, contextStore); +TEST_F( + FlipperConnectionManagerImplTerminationTest, + testNonStartedEventBaseDoesntHang) { + auto config = + FlipperInitConfig{DeviceData{}, new EventBase(), new EventBase()}; + auto instance = std::make_shared( + config, state, contextStore); instance->start(); } -TEST_F(FlipperConnectionManagerImplTerminationTest, testStartedEventBaseDoesntHang) { +TEST_F( + FlipperConnectionManagerImplTerminationTest, + testStartedEventBaseDoesntHang) { auto flipperEventBase = new EventBase(); auto connectionEventBase = new EventBase(); - auto flipperThread = std::thread([flipperEventBase](){ - flipperEventBase->loopForever(); - }); - auto connectionThread = std::thread([connectionEventBase](){ - connectionEventBase->loopForever(); - }); - auto config = FlipperInitConfig { - DeviceData {}, - flipperEventBase, - connectionEventBase - }; - auto instance = std::make_shared(config, state, contextStore); + auto flipperThread = + std::thread([flipperEventBase]() { flipperEventBase->loopForever(); }); + auto connectionThread = std::thread( + [connectionEventBase]() { connectionEventBase->loopForever(); }); + auto config = + FlipperInitConfig{DeviceData{}, flipperEventBase, connectionEventBase}; + auto instance = std::make_shared( + config, state, contextStore); instance->start();