From c1295b1bc9e5f225f85f2a47ad43232070640cd6 Mon Sep 17 00:00:00 2001 From: John Knox Date: Mon, 24 Sep 2018 05:53:51 -0700 Subject: [PATCH] Rename SonarState* to FlipperState* Summary: Part of sonar to flipper rename Reviewed By: passy Differential Revision: D9919821 fbshipit-source-id: a44a2a04d5463750f884f8bf1328e02d56593e82 --- android/src/main/cpp/sonar.cpp | 8 +++---- iOS/FlipperKit/SKStateUpdateCPPWrapper.h | 4 ++-- xplat/Flipper/FlipperClient.cpp | 6 ++--- xplat/Flipper/FlipperClient.h | 8 +++---- .../Flipper/FlipperConnectionManagerImpl.cpp | 2 +- xplat/Flipper/FlipperConnectionManagerImpl.h | 6 ++--- .../{SonarState.cpp => FlipperState.cpp} | 22 +++++++++---------- .../Flipper/{SonarState.h => FlipperState.h} | 10 ++++----- ...istener.h => FlipperStateUpdateListener.h} | 2 +- xplat/Flipper/SonarStep.cpp | 4 ++-- xplat/Flipper/SonarStep.h | 6 ++--- xplat/FlipperTests/SonarClientTests.cpp | 2 +- .../SonarWebSocketImplTerminationTests.cpp | 4 ++-- 13 files changed, 42 insertions(+), 42 deletions(-) rename xplat/Flipper/{SonarState.cpp => FlipperState.cpp} (70%) rename xplat/Flipper/{SonarState.h => FlipperState.h} (84%) rename xplat/Flipper/{SonarStateUpdateListener.h => FlipperStateUpdateListener.h} (87%) diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index 67083e974..acabfb72c 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include using namespace facebook; using namespace facebook::flipper; @@ -222,7 +222,7 @@ class JFlipperStateUpdateListener : public jni::JavaClass stateListener); void onUpdate(); @@ -378,7 +378,7 @@ class JFlipperClient : public jni::HybridClass { private: friend HybridBase; - std::shared_ptr mStateListener = nullptr; + std::shared_ptr mStateListener = nullptr; JFlipperClient() {} }; diff --git a/iOS/FlipperKit/SKStateUpdateCPPWrapper.h b/iOS/FlipperKit/SKStateUpdateCPPWrapper.h index cd1c3b179..1db653b97 100644 --- a/iOS/FlipperKit/SKStateUpdateCPPWrapper.h +++ b/iOS/FlipperKit/SKStateUpdateCPPWrapper.h @@ -1,6 +1,6 @@ #ifdef FB_SONARKIT_ENABLED -#include +#include #import "FlipperStateUpdateListener.h" /* @@ -8,7 +8,7 @@ * A SKStateUpdateCPPWrapper instance allows for wrapping an Objective-C object * and passing it to the pure C++ SonarClient, so it can be triggered when updates occur. */ -class SKStateUpdateCPPWrapper : public SonarStateUpdateListener { +class SKStateUpdateCPPWrapper : public FlipperStateUpdateListener { public: SKStateUpdateCPPWrapper(id delegate_); void onUpdate(); diff --git a/xplat/Flipper/FlipperClient.cpp b/xplat/Flipper/FlipperClient.cpp index 7a23de8c8..a279757b1 100644 --- a/xplat/Flipper/FlipperClient.cpp +++ b/xplat/Flipper/FlipperClient.cpp @@ -9,7 +9,7 @@ #include "FlipperClient.h" #include "FlipperConnectionImpl.h" #include "FlipperResponderImpl.h" -#include "SonarState.h" +#include "FlipperState.h" #include "SonarStep.h" #include "FlipperConnectionManagerImpl.h" #include "ConnectionContextStore.h" @@ -29,7 +29,7 @@ static FlipperClient* kInstance; using folly::dynamic; void FlipperClient::init(FlipperInitConfig config) { - auto state = std::make_shared(); + auto state = std::make_shared(); auto context = std::make_shared(config.deviceData); kInstance = new FlipperClient(std::make_unique(std::move(config), state, context), state); @@ -40,7 +40,7 @@ FlipperClient* FlipperClient::instance() { } void FlipperClient::setStateListener( - std::shared_ptr stateListener) { + std::shared_ptr stateListener) { log("Setting state listener"); sonarState_->setUpdateListener(stateListener); } diff --git a/xplat/Flipper/FlipperClient.h b/xplat/Flipper/FlipperClient.h index 1adba46ed..64263cd11 100644 --- a/xplat/Flipper/FlipperClient.h +++ b/xplat/Flipper/FlipperClient.h @@ -11,7 +11,7 @@ #include "FlipperConnectionImpl.h" #include "FlipperInitConfig.h" #include "FlipperPlugin.h" -#include "SonarState.h" +#include "FlipperState.h" #include "FlipperConnectionManager.h" #include #include @@ -40,7 +40,7 @@ class FlipperClient : public FlipperConnectionManager::Callbacks { /** Only public for testing */ - FlipperClient(std::unique_ptr socket, std::shared_ptr state) + FlipperClient(std::unique_ptr socket, std::shared_ptr state) : socket_(std::move(socket)), sonarState_(state) { auto step = sonarState_->start("Create client"); socket_->setCallbacks(this); @@ -72,7 +72,7 @@ class FlipperClient : public FlipperConnectionManager::Callbacks { void refreshPlugins(); void setStateListener( - std::shared_ptr stateListener); + std::shared_ptr stateListener); std::shared_ptr getPlugin(const std::string& identifier); @@ -94,7 +94,7 @@ class FlipperClient : public FlipperConnectionManager::Callbacks { std::map> plugins_; std::map> connections_; std::mutex mutex_; - std::shared_ptr sonarState_; + std::shared_ptr sonarState_; void performAndReportError(const std::function& func); void disconnect(std::shared_ptr plugin); diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp index 23f9a4f8b..8b133e0d6 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp +++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp @@ -77,7 +77,7 @@ class Responder : public rsocket::RSocketResponder { } }; -FlipperConnectionManagerImpl::FlipperConnectionManagerImpl(FlipperInitConfig config, std::shared_ptr state, std::shared_ptr contextStore) +FlipperConnectionManagerImpl::FlipperConnectionManagerImpl(FlipperInitConfig config, std::shared_ptr state, std::shared_ptr contextStore) : deviceData_(config.deviceData), sonarState_(state), sonarEventBase_(config.callbackWorker), connectionEventBase_(config.connectionWorker), contextStore_(contextStore) { CHECK_THROW(config.callbackWorker, std::invalid_argument); CHECK_THROW(config.connectionWorker, std::invalid_argument); diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.h b/xplat/Flipper/FlipperConnectionManagerImpl.h index 7e11a40cd..35cb6bb6a 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.h +++ b/xplat/Flipper/FlipperConnectionManagerImpl.h @@ -10,7 +10,7 @@ #include "FlipperInitConfig.h" #include "FlipperConnectionManager.h" -#include "SonarState.h" +#include "FlipperState.h" #include #include #include @@ -28,7 +28,7 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager { friend Responder; public: - FlipperConnectionManagerImpl(FlipperInitConfig config, std::shared_ptr state, std::shared_ptr contextStore); + FlipperConnectionManagerImpl(FlipperInitConfig config, std::shared_ptr state, std::shared_ptr contextStore); ~FlipperConnectionManagerImpl(); @@ -48,7 +48,7 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager { bool isOpen_ = false; Callbacks* callbacks_; DeviceData deviceData_; - std::shared_ptr sonarState_; + std::shared_ptr sonarState_; folly::EventBase* sonarEventBase_; folly::EventBase* connectionEventBase_; diff --git a/xplat/Flipper/SonarState.cpp b/xplat/Flipper/FlipperState.cpp similarity index 70% rename from xplat/Flipper/SonarState.cpp rename to xplat/Flipper/FlipperState.cpp index 080b67e82..c68f4bc66 100644 --- a/xplat/Flipper/SonarState.cpp +++ b/xplat/Flipper/FlipperState.cpp @@ -5,8 +5,8 @@ * file in the root directory of this source tree. * */ -#include "SonarState.h" -#include "SonarStateUpdateListener.h" +#include "FlipperState.h" +#include "FlipperStateUpdateListener.h" #include "SonarStep.h" #include @@ -16,13 +16,13 @@ using namespace facebook::flipper; * view of the current state of the sonar client. */ -SonarState::SonarState(): log("") {} -void SonarState::setUpdateListener( - std::shared_ptr listener) { +FlipperState::FlipperState(): log("") {} +void FlipperState::setUpdateListener( + std::shared_ptr listener) { mListener = listener; } -void SonarState::started(std::string step) { +void FlipperState::started(std::string step) { if (stateMap.find(step) == stateMap.end()) { insertOrder.push_back(step); } @@ -32,7 +32,7 @@ void SonarState::started(std::string step) { } } -void SonarState::success(std::string step) { +void FlipperState::success(std::string step) { log = log + "[Success] " + step + "\n"; stateMap[step] = State::success; if (mListener) { @@ -40,7 +40,7 @@ void SonarState::success(std::string step) { } } -void SonarState::failed(std::string step, std::string errorMessage) { +void FlipperState::failed(std::string step, std::string errorMessage) { log = log + "[Failed] " + step + ": " + errorMessage + "\n"; stateMap[step] = State::failed; if (mListener) { @@ -51,11 +51,11 @@ void SonarState::failed(std::string step, std::string errorMessage) { // TODO: Currently returns string, but should really provide a better // representation of the current state so the UI can show it in a more intuitive // way -std::string SonarState::getState() { +std::string FlipperState::getState() { return log; } -std::vector SonarState::getStateElements() { +std::vector FlipperState::getStateElements() { std::vector v; for (auto stepName : insertOrder) { v.push_back(StateElement(stepName, stateMap[stepName])); @@ -63,7 +63,7 @@ std::vector SonarState::getStateElements() { return v; } -std::shared_ptr SonarState::start(std::string step_name) { +std::shared_ptr FlipperState::start(std::string step_name) { started(step_name); return std::make_shared(step_name, this); } diff --git a/xplat/Flipper/SonarState.h b/xplat/Flipper/FlipperState.h similarity index 84% rename from xplat/Flipper/SonarState.h rename to xplat/Flipper/FlipperState.h index 0b46ea2d6..a0b02a97f 100644 --- a/xplat/Flipper/SonarState.h +++ b/xplat/Flipper/FlipperState.h @@ -14,7 +14,7 @@ #include class SonarStep; -class SonarStateUpdateListener; +class FlipperStateUpdateListener; namespace facebook { namespace flipper { @@ -31,12 +31,12 @@ public: } } -class SonarState { +class FlipperState { friend SonarStep; public: - SonarState(); - void setUpdateListener(std::shared_ptr); + FlipperState(); + void setUpdateListener(std::shared_ptr); std::string getState(); std::vector getStateElements(); @@ -51,7 +51,7 @@ class SonarState { void failed(std::string, std::string); void started(std::string); - std::shared_ptr mListener = nullptr; + std::shared_ptr mListener = nullptr; std::string log; std::vector insertOrder; std::map stateMap; diff --git a/xplat/Flipper/SonarStateUpdateListener.h b/xplat/Flipper/FlipperStateUpdateListener.h similarity index 87% rename from xplat/Flipper/SonarStateUpdateListener.h rename to xplat/Flipper/FlipperStateUpdateListener.h index a69143b1f..cc7714fb1 100644 --- a/xplat/Flipper/SonarStateUpdateListener.h +++ b/xplat/Flipper/FlipperStateUpdateListener.h @@ -8,7 +8,7 @@ #pragma once -class SonarStateUpdateListener { +class FlipperStateUpdateListener { public: virtual void onUpdate() = 0; }; diff --git a/xplat/Flipper/SonarStep.cpp b/xplat/Flipper/SonarStep.cpp index 46c1fe7e3..47c24253e 100644 --- a/xplat/Flipper/SonarStep.cpp +++ b/xplat/Flipper/SonarStep.cpp @@ -6,7 +6,7 @@ * */ #include "SonarStep.h" -#include "SonarState.h" +#include "FlipperState.h" void SonarStep::complete() { isLogged = true; @@ -18,7 +18,7 @@ void SonarStep::fail(std::string message) { state->failed(name, message); } -SonarStep::SonarStep(std::string step, SonarState* s) { +SonarStep::SonarStep(std::string step, FlipperState* s) { state = s; name = step; } diff --git a/xplat/Flipper/SonarStep.h b/xplat/Flipper/SonarStep.h index 854c93d78..f56e295fa 100644 --- a/xplat/Flipper/SonarStep.h +++ b/xplat/Flipper/SonarStep.h @@ -10,7 +10,7 @@ #include -class SonarState; +class FlipperState; class SonarStep { public: @@ -22,11 +22,11 @@ class SonarStep { // Mark the step as failed, and provide a message. void fail(std::string message); - SonarStep(std::string name, SonarState* state); + SonarStep(std::string name, FlipperState* state); ~SonarStep(); private: std::string name; bool isLogged = false; - SonarState* state; + FlipperState* state; }; diff --git a/xplat/FlipperTests/SonarClientTests.cpp b/xplat/FlipperTests/SonarClientTests.cpp index 775b07145..5f3bfa20f 100644 --- a/xplat/FlipperTests/SonarClientTests.cpp +++ b/xplat/FlipperTests/SonarClientTests.cpp @@ -19,7 +19,7 @@ namespace test { using folly::dynamic; -auto state = std::make_shared(); +auto state = std::make_shared(); TEST(SonarClientTests, testSaneMocks) { FlipperConnectionManagerMock socket; diff --git a/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp b/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp index 0fd312d3e..8be0c19b5 100644 --- a/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp +++ b/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp @@ -19,13 +19,13 @@ using folly::EventBase; class FlipperConnectionManagerImplTerminationTest : public ::testing::Test { protected: - std::shared_ptr state; + std::shared_ptr state; std::shared_ptr contextStore; void SetUp() override { // Folly singletons must be registered before they are used. // Without this, test fails in phabricator. folly::SingletonVault::singleton()->registrationComplete(); - state = std::make_shared(); + state = std::make_shared(); contextStore = std::make_shared(); } };