Revert D8932114: [sonar] Add state tracking plumbing

Differential Revision:
D8932114

Original commit changeset: fb03babfe92b

fbshipit-source-id: a6a372a4115d69b5419a8c9924b333e7c163497b

android/src/main/cpp/sonar.cpp

@@ -22,7 +22,6 @@
 #include <Sonar/SonarWebSocket.h>
 #include <Sonar/SonarConnection.h>
 #include <Sonar/SonarResponder.h>
-#include <Sonar/SonarStateUpdateListener.h>
 
 using namespace facebook;
 using namespace facebook::sonar;
@@ -199,37 +198,6 @@ class JSonarPlugin : public jni::JavaClass<JSonarPlugin> {
   }
 };
 
-class JSonarStateUpdateListener : public jni::JavaClass<JSonarStateUpdateListener> {
- public:
-  constexpr static auto  kJavaDescriptor = "Lcom/facebook/sonar/core/SonarStateUpdateListener;";
-
-  void onUpdate() {
-    static const auto method = javaClassStatic()->getMethod<void()>("onUpdate");
-    method(self());
-  }
-  void onStepStarted(std::string step) {
-    static const auto method = javaClassStatic()->getMethod<void(std::string)>("onStepStarted");
-    method(self(), step);
-  }
-  void onStepSuccess(std::string step) {
-    static const auto method = javaClassStatic()->getMethod<void(std::string)>("onStepSuccess");
-    method(self(), step);
-  }
-  void onStepFailed(std::string step, std::string errorMessage) {
-    static const auto method = javaClassStatic()->getMethod<void(std::string, std::string)>("onStepFailed");
-    method(self(), step, errorMessage);
-  }
-};
-
-class AndroidSonarStateUpdateListener : public SonarStateUpdateListener {
- public:
-  AndroidSonarStateUpdateListener(jni::alias_ref<JSonarStateUpdateListener> stateListener);
-  void onUpdate();
-
-  private:
-   jni::global_ref<JSonarStateUpdateListener> jStateListener;
-};
-
 class JSonarPluginWrapper : public SonarPlugin {
  public:
   jni::global_ref<JSonarPlugin> jplugin;
@@ -261,10 +229,7 @@ class JSonarClient : public jni::HybridClass<JSonarClient> {
       makeNativeMethod("stop", JSonarClient::stop),
       makeNativeMethod("addPlugin", JSonarClient::addPlugin),
       makeNativeMethod("removePlugin", JSonarClient::removePlugin),
-      makeNativeMethod("subscribeForUpdates", JSonarClient::subscribeForUpdates),
-      makeNativeMethod("unsubscribe", JSonarClient::unsubscribe),
       makeNativeMethod("getPlugin", JSonarClient::getPlugin),
-      makeNativeMethod("getState", JSonarClient::getState),
     });
   }
 
@@ -291,22 +256,6 @@ class JSonarClient : public jni::HybridClass<JSonarClient> {
     client->removePlugin(client->getPlugin(plugin->identifier()));
   }
 
-  void subscribeForUpdates(jni::alias_ref<JSonarStateUpdateListener> stateListener) {
-    auto client = SonarClient::instance();
-    mStateListener = std::make_shared<AndroidSonarStateUpdateListener>(stateListener);
-    client->setStateListener(mStateListener);
-  }
-
-  void unsubscribe() {
-    auto client = SonarClient::instance();
-    mStateListener = nullptr;
-    client->setStateListener(nullptr);
-  }
-
-  std::string getState() {
-    return SonarClient::instance()->getState();
-  }
-
   jni::alias_ref<JSonarPlugin> getPlugin(const std::string& identifier) {
     auto plugin = SonarClient::instance()->getPlugin(identifier);
     if (plugin) {
@@ -346,7 +295,6 @@ class JSonarClient : public jni::HybridClass<JSonarClient> {
 
  private:
   friend HybridBase;
-  std::shared_ptr<SonarStateUpdateListener> mStateListener = nullptr;
 
   JSonarClient() {}
 };
@@ -361,11 +309,3 @@ jint JNI_OnLoad(JavaVM* vm, void*) {
     JEventBase::registerNatives();
   });
 }
-
-AndroidSonarStateUpdateListener::AndroidSonarStateUpdateListener(jni::alias_ref<JSonarStateUpdateListener> stateListener) {
-  jStateListener = jni::make_global(stateListener);
-}
-
-void AndroidSonarStateUpdateListener::onUpdate() {
-  jStateListener->onUpdate();
-}

android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java

@@ -13,7 +13,6 @@ import com.facebook.soloader.SoLoader;
 import com.facebook.sonar.BuildConfig;
 import com.facebook.sonar.core.SonarClient;
 import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarStateUpdateListener;
 
 @DoNotStrip
 class SonarClientImpl implements SonarClient {
@@ -56,13 +55,4 @@ class SonarClientImpl implements SonarClient {
 
   @Override
   public native void stop();
-
-  @Override
-  public native void subscribeForUpdates(SonarStateUpdateListener stateListener);
-
-  @Override
-  public native void unsubscribe();
-
-  @Override
-  public native String getState();
 }

android/src/main/java/com/facebook/sonar/core/SonarClient.java

@@ -17,10 +17,4 @@ public interface SonarClient {
   void start();
 
   void stop();
-
-  void subscribeForUpdates(SonarStateUpdateListener stateListener);
-
-  void unsubscribe();
-
-  String getState();
 }

android/src/main/java/com/facebook/sonar/core/SonarStateUpdateListener.java

@@ -1,7 +0,0 @@
-package com.facebook.sonar.core;
-
-public interface SonarStateUpdateListener {
-
-  void onUpdate();
-
-}

xplat/Sonar/SonarClient.cpp

@@ -9,8 +9,6 @@
 #include "SonarClient.h"
 #include "SonarConnectionImpl.h"
 #include "SonarResponderImpl.h"
-#include "SonarState.h"
-#include "SonarStep.h"
 #include "SonarWebSocketImpl.h"
 
 #ifdef __ANDROID__
@@ -39,12 +37,6 @@ SonarClient* SonarClient::instance() {
   return kInstance;
 }
 
-void SonarClient::setStateListener(
-    std::shared_ptr<SonarStateUpdateListener> stateListener) {
-  SONAR_LOG("Setting state listener");
-  sonarState_->setUpdateListener(stateListener);
-}
-
 void SonarClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
   SONAR_LOG(("SonarClient::addPlugin " + plugin->identifier()).c_str());
 
@@ -206,10 +198,6 @@ void SonarClient::performAndReportError(const std::function<void()>& func) {
   }
 }
 
-std::string SonarClient::getState() {
-  return sonarState_->getState();
-}
-
 } // namespace sonar
 } // namespace facebook
 

xplat/Sonar/SonarClient.h

@@ -11,11 +11,9 @@
 #include <Sonar/SonarConnectionImpl.h>
 #include <Sonar/SonarInitConfig.h>
 #include <Sonar/SonarPlugin.h>
-#include <Sonar/SonarState.h>
 #include <Sonar/SonarWebSocket.h>
 #include <map>
 #include <mutex>
-#include "SonarStep.h"
 
 namespace facebook {
 namespace sonar {
@@ -41,7 +39,6 @@ class SonarClient : public SonarWebSocket::Callbacks {
    */
   SonarClient(std::unique_ptr<SonarWebSocket> socket)
       : socket_(std::move(socket)) {
-    sonarState_ = std::make_unique<SonarState>();
     socket_->setCallbacks(this);
   }
 
@@ -65,13 +62,8 @@ class SonarClient : public SonarWebSocket::Callbacks {
 
   void refreshPlugins();
 
-  void setStateListener(
-      std::shared_ptr<SonarStateUpdateListener> stateListener);
-
   std::shared_ptr<SonarPlugin> getPlugin(const std::string& identifier);
 
-  std::string getState();
-
   template <typename P>
   std::shared_ptr<P> getPlugin(const std::string& identifier) {
     return std::static_pointer_cast<P>(getPlugin(identifier));
@@ -86,7 +78,6 @@ class SonarClient : public SonarWebSocket::Callbacks {
   std::map<std::string, std::shared_ptr<SonarPlugin>> plugins_;
   std::map<std::string, std::shared_ptr<SonarConnectionImpl>> connections_;
   std::mutex mutex_;
-  std::unique_ptr<SonarState> sonarState_;
 
   void performAndReportError(const std::function<void()>& func);
   void disconnect(std::shared_ptr<SonarPlugin> plugin);

xplat/Sonar/SonarState.cpp

@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
- *
- */
-#include "SonarState.h"
-#include "SonarStateUpdateListener.h"
-#include "SonarStep.h"
-
-/* Class responsible for collecting state updates and combining them into a
- * view of the current state of the sonar client. */
-
-SonarState::SonarState() {
-  stateUpdates = "";
-}
-void SonarState::setUpdateListener(
-    std::shared_ptr<SonarStateUpdateListener> listener) {
-  mListener = listener;
-}
-
-void SonarState::started(std::string step) {
-  stateUpdates = stateUpdates + "[Started] " + step + "\n";
-  if (mListener) {
-    mListener->onUpdate();
-  }
-}
-
-void SonarState::success(std::string step) {
-  stateUpdates = stateUpdates + "[Success] " + step + "\n";
-  if (mListener) {
-    mListener->onUpdate();
-  }
-}
-
-void SonarState::failed(std::string step, std::string errorMessage) {
-  stateUpdates = stateUpdates + "[Failed] " + step + "\n";
-  if (mListener) {
-    mListener->onUpdate();
-  }
-}
-
-// 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() {
-  return stateUpdates;
-}
-
-std::shared_ptr<SonarStep> SonarState::start(std::string step_name) {
-  started(step_name);
-  return std::make_shared<SonarStep>(step_name, this);
-}

xplat/Sonar/SonarState.h

@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
- *
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-class SonarStep;
-class SonarStateUpdateListener;
-
-class SonarState {
-  friend SonarStep;
-
- public:
-  SonarState();
-  void setUpdateListener(std::shared_ptr<SonarStateUpdateListener>);
-  std::string getState();
-
-  /* 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,
-   the absense of the completion call when it is destructed will register as a
-   step failure. */
-  std::shared_ptr<SonarStep> start(std::string step);
-
- private:
-  void success(std::string);
-  void failed(std::string, std::string);
-  void started(std::string);
-  std::shared_ptr<SonarStateUpdateListener> mListener = nullptr;
-  std::string stateUpdates;
-};

xplat/Sonar/SonarStateUpdateListener.h

@@ -1,14 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
- *
- */
-
-#pragma once
-
-class SonarStateUpdateListener {
- public:
-  virtual void onUpdate() = 0;
-};

xplat/Sonar/SonarStep.cpp

@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
- *
- */
-#include "SonarStep.h"
-#include "SonarState.h"
-
-void SonarStep::complete() {
-  isCompleted = true;
-  state->success(name);
-}
-
-SonarStep::SonarStep(std::string step, SonarState* s) {
-  state = s;
-  name = step;
-}
-
-SonarStep::~SonarStep() {
-  if (!isCompleted) {
-    state->failed(name, "");
-  }
-}

xplat/Sonar/SonarStep.h

@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
- *
- */
-
-#pragma once
-
-#include <string>
-
-class SonarState;
-
-class SonarStep {
- public:
-  void complete();
-  SonarStep(std::string name, SonarState* state);
-  ~SonarStep();
-
- private:
-  std::string name;
-  bool isCompleted = false;
-  SonarState* state;
-};