From 0a20d951951f93e6c268426ddbb3c44b3f3b7d29 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 20 Sep 2018 10:29:14 -0700 Subject: [PATCH] Rename java core classes Summary: Rename everything `Sonar*.java` in `core/`. Biggest chunk of the rename happened with ```fish for name in (cat names.txt) ambr --no-interactive --regex '\b'"$name"'\b' (echo $name | sed 's/Sonar/Flipper/') fbandroid/java/com/facebook end ``` names.txt: ``` SonarArray SonarClient SonarConnection SonarDynamic SonarObject SonarPlugin SonarReceiver SonarResponder SonarStateUpdateListener SonarValue ``` The controller you requested could not be found. Reviewed By: priteshrnandgaonkar Differential Revision: D9940900 fbshipit-source-id: 4a1342fac02513025d80dcb0af62c26ea38b5086 --- .../sample/FlipperSampleApplication.java | 4 +- android/src/main/cpp/sonar.cpp | 14 +- .../flipper/android/AndroidSonarClient.java | 6 +- .../flipper/android/SonarClientImpl.java | 16 +- .../flipper/android/SonarConnectionImpl.java | 20 +-- .../flipper/android/SonarResponderImpl.java | 20 +-- .../diagnostics/SonarDiagnosticActivity.java | 10 +- .../flipper/core/ErrorReportingRunnable.java | 4 +- .../{SonarArray.java => FlipperArray.java} | 32 ++-- .../{SonarClient.java => FlipperClient.java} | 10 +- ...Connection.java => FlipperConnection.java} | 12 +- ...{SonarDynamic.java => FlipperDynamic.java} | 16 +- .../{SonarObject.java => FlipperObject.java} | 52 +++---- .../{SonarPlugin.java => FlipperPlugin.java} | 16 +- ...onarReceiver.java => FlipperReceiver.java} | 4 +- ...arResponder.java => FlipperResponder.java} | 8 +- .../core/FlipperStateUpdateListener.java | 12 ++ .../{SonarValue.java => FlipperValue.java} | 4 +- .../core/SonarStateUpdateListener.java | 12 -- .../plugins/common/BufferingSonarPlugin.java | 24 +-- .../common/MainThreadSonarReceiver.java | 18 +-- .../plugins/console/ConsoleSonarPlugin.java | 8 +- .../console/iface/ConsoleCommandReceiver.java | 30 ++-- .../plugins/inspector/DescriptorMapping.java | 4 +- .../inspector/InspectorSonarPlugin.java | 142 +++++++++--------- .../plugins/inspector/InspectorValue.java | 10 +- .../plugins/inspector/NodeDescriptor.java | 38 ++--- .../plugins/inspector/SearchResultNode.java | 18 +-- .../descriptors/ActivityDescriptor.java | 8 +- .../descriptors/ApplicationDescriptor.java | 20 +-- .../descriptors/DialogDescriptor.java | 8 +- .../descriptors/DialogFragmentDescriptor.java | 10 +- .../descriptors/DrawableDescriptor.java | 10 +- .../descriptors/FragmentDescriptor.java | 14 +- .../descriptors/ObjectDescriptor.java | 8 +- .../SupportDialogFragmentDescriptor.java | 10 +- .../SupportFragmentDescriptor.java | 14 +- .../descriptors/TextViewDescriptor.java | 18 +-- .../inspector/descriptors/ViewDescriptor.java | 52 +++---- .../descriptors/ViewGroupDescriptor.java | 18 +-- .../descriptors/WindowDescriptor.java | 8 +- .../descriptors/utils/AccessibilityUtil.java | 34 ++--- .../leakcanary/LeakCanarySonarPlugin.java | 22 +-- .../plugins/leakcanary/RecordLeakService.java | 4 +- .../litho/DebugComponentDescriptor.java | 60 ++++---- ...hoAccessibilityRenderExtensionCommand.java | 12 +- .../plugins/litho/LithoViewDescriptor.java | 20 +-- .../plugins/network/NetworkSonarPlugin.java | 18 +-- .../plugins/sandbox/SandboxSonarPlugin.java | 30 ++-- .../SharedPreferencesSonarPlugin.java | 30 ++-- .../flipper/testing/SonarConnectionMock.java | 18 +-- .../flipper/testing/SonarResponderMock.java | 18 +-- 52 files changed, 514 insertions(+), 514 deletions(-) rename android/src/main/java/com/facebook/flipper/core/{SonarArray.java => FlipperArray.java} (80%) rename android/src/main/java/com/facebook/flipper/core/{SonarClient.java => FlipperClient.java} (58%) rename android/src/main/java/com/facebook/flipper/core/{SonarConnection.java => FlipperConnection.java} (67%) rename android/src/main/java/com/facebook/flipper/core/{SonarDynamic.java => FlipperDynamic.java} (88%) rename android/src/main/java/com/facebook/flipper/core/{SonarObject.java => FlipperObject.java} (76%) rename android/src/main/java/com/facebook/flipper/core/{SonarPlugin.java => FlipperPlugin.java} (56%) rename android/src/main/java/com/facebook/flipper/core/{SonarReceiver.java => FlipperReceiver.java} (86%) rename android/src/main/java/com/facebook/flipper/core/{SonarResponder.java => FlipperResponder.java} (83%) create mode 100644 android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java rename android/src/main/java/com/facebook/flipper/core/{SonarValue.java => FlipperValue.java} (77%) delete mode 100644 android/src/main/java/com/facebook/flipper/core/SonarStateUpdateListener.java diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java index c610845d3..0b0eb1f76 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java @@ -7,7 +7,7 @@ import android.content.Context; import com.facebook.litho.config.ComponentsConfiguration; import com.facebook.soloader.SoLoader; import com.facebook.flipper.android.AndroidSonarClient; -import com.facebook.flipper.core.SonarClient; +import com.facebook.flipper.core.FlipperClient; import com.facebook.flipper.plugins.inspector.DescriptorMapping; import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin; import com.facebook.flipper.plugins.leakcanary.LeakCanarySonarPlugin; @@ -27,7 +27,7 @@ public class FlipperSampleApplication extends Application { super.onCreate(); SoLoader.init(this, false); - final SonarClient client = AndroidSonarClient.getInstance(this); + final FlipperClient client = AndroidSonarClient.getInstance(this); final DescriptorMapping descriptorMapping = DescriptorMapping.withDefaults(); NetworkSonarPlugin networkPlugin = new NetworkSonarPlugin(); diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp index a28cb76f4..b2249dfe9 100644 --- a/android/src/main/cpp/sonar.cpp +++ b/android/src/main/cpp/sonar.cpp @@ -64,7 +64,7 @@ class JEventBase : public jni::HybridClass { class JFlipperObject : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarObject;"; + constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperObject;"; static jni::local_ref create(const folly::dynamic& json) { return newInstance(folly::toJson(json)); @@ -78,7 +78,7 @@ class JFlipperObject : public jni::JavaClass { class JFlipperArray : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarArray;"; + constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperArray;"; static jni::local_ref create(const folly::dynamic& json) { return newInstance(folly::toJson(json)); @@ -92,7 +92,7 @@ class JFlipperArray : public jni::JavaClass { class JFlipperResponder : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarResponder;"; + constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperResponder;"; }; class JFlipperResponderImpl : public jni::HybridClass { @@ -128,7 +128,7 @@ class JFlipperResponderImpl : public jni::HybridClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarReceiver;"; + 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"); @@ -138,7 +138,7 @@ class JFlipperReceiver : public jni::JavaClass { class JFlipperConnection : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarConnection;"; + constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperConnection;"; }; class JFlipperConnectionImpl : public jni::HybridClass { @@ -182,7 +182,7 @@ class JFlipperConnectionImpl : public jni::HybridClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarPlugin;"; + constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperPlugin;"; std::string identifier() const { static const auto method = javaClassStatic()->getMethod("getId"); @@ -202,7 +202,7 @@ class JFlipperPlugin : public jni::JavaClass { class JFlipperStateUpdateListener : public jni::JavaClass { public: - constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarStateUpdateListener;"; + constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/FlipperStateUpdateListener;"; void onUpdate() { static const auto method = javaClassStatic()->getMethod("onUpdate"); diff --git a/android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java b/android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java index 865bad0a6..646fd319e 100644 --- a/android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java +++ b/android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java @@ -14,7 +14,7 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.support.v4.content.ContextCompat; import android.util.Log; -import com.facebook.flipper.core.SonarClient; +import com.facebook.flipper.core.FlipperClient; public final class AndroidSonarClient { private static boolean sIsInitialized = false; @@ -23,7 +23,7 @@ public final class AndroidSonarClient { private static final String[] REQUIRED_PERMISSIONS = new String[] {"android.permission.INTERNET", "android.permission.ACCESS_WIFI_STATE"}; - public static synchronized SonarClient getInstance(Context context) { + public static synchronized FlipperClient getInstance(Context context) { if (!sIsInitialized) { checkRequiredPermissions(context); sSonarThread = new SonarThread("SonarEventBaseThread"); @@ -48,7 +48,7 @@ public final class AndroidSonarClient { return SonarClientImpl.getInstance(); } - public static synchronized SonarClient getInstanceIfInitialized() { + public static synchronized FlipperClient getInstanceIfInitialized() { if (!sIsInitialized) { return null; } diff --git a/android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java b/android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java index 99ee2aff7..bc7146f05 100644 --- a/android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java +++ b/android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java @@ -11,13 +11,13 @@ import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.soloader.SoLoader; import com.facebook.flipper.BuildConfig; -import com.facebook.flipper.core.SonarClient; -import com.facebook.flipper.core.SonarPlugin; -import com.facebook.flipper.core.SonarStateUpdateListener; +import com.facebook.flipper.core.FlipperClient; +import com.facebook.flipper.core.FlipperPlugin; +import com.facebook.flipper.core.FlipperStateUpdateListener; import com.facebook.flipper.core.StateSummary; @DoNotStrip -class SonarClientImpl implements SonarClient { +class SonarClientImpl implements FlipperClient { static { if (BuildConfig.IS_INTERNAL_BUILD) { SoLoader.loadLibrary("sonar"); @@ -44,13 +44,13 @@ class SonarClientImpl implements SonarClient { public static native SonarClientImpl getInstance(); @Override - public native void addPlugin(SonarPlugin plugin); + public native void addPlugin(FlipperPlugin plugin); @Override - public native T getPlugin(String id); + public native T getPlugin(String id); @Override - public native void removePlugin(SonarPlugin plugin); + public native void removePlugin(FlipperPlugin plugin); @Override public native void start(); @@ -59,7 +59,7 @@ class SonarClientImpl implements SonarClient { public native void stop(); @Override - public native void subscribeForUpdates(SonarStateUpdateListener stateListener); + public native void subscribeForUpdates(FlipperStateUpdateListener stateListener); @Override public native void unsubscribe(); diff --git a/android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java b/android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java index 2a01e3e34..4bac94919 100644 --- a/android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java +++ b/android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java @@ -11,13 +11,13 @@ import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.soloader.SoLoader; import com.facebook.flipper.BuildConfig; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarReceiver; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperReceiver; @DoNotStrip -class SonarConnectionImpl implements SonarConnection { +class SonarConnectionImpl implements FlipperConnection { static { if (BuildConfig.IS_INTERNAL_BUILD) { SoLoader.loadLibrary("sonar"); @@ -31,22 +31,22 @@ class SonarConnectionImpl implements SonarConnection { } @Override - public void send(String method, SonarObject params) { + public void send(String method, FlipperObject params) { sendObject(method, params); } @Override - public void send(String method, SonarArray params) { + public void send(String method, FlipperArray params) { sendArray(method, params); } - public native void sendObject(String method, SonarObject params); + public native void sendObject(String method, FlipperObject params); - public native void sendArray(String method, SonarArray params); + public native void sendArray(String method, FlipperArray params); @Override public native void reportError(Throwable throwable); @Override - public native void receive(String method, SonarReceiver receiver); + public native void receive(String method, FlipperReceiver receiver); } diff --git a/android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java b/android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java index e00fe9130..926348dda 100644 --- a/android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java +++ b/android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java @@ -11,12 +11,12 @@ import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.soloader.SoLoader; import com.facebook.flipper.BuildConfig; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperResponder; @DoNotStrip -class SonarResponderImpl implements SonarResponder { +class SonarResponderImpl implements FlipperResponder { static { if (BuildConfig.IS_INTERNAL_BUILD) { SoLoader.loadLibrary("sonar"); @@ -30,24 +30,24 @@ class SonarResponderImpl implements SonarResponder { } @Override - public void success(SonarObject params) { + public void success(FlipperObject params) { successObject(params); } @Override - public void success(SonarArray params) { + public void success(FlipperArray params) { successArray(params); } @Override public void success() { - successObject(new SonarObject.Builder().build()); + successObject(new FlipperObject.Builder().build()); } - public native void successObject(SonarObject response); + public native void successObject(FlipperObject response); - public native void successArray(SonarArray response); + public native void successArray(FlipperArray response); @Override - public native void error(SonarObject response); + public native void error(FlipperObject response); } diff --git a/android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java b/android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java index 6983b7395..7ca056286 100644 --- a/android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java +++ b/android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java @@ -5,8 +5,8 @@ import android.content.Context; import android.os.Bundle; import android.widget.Toast; import com.facebook.flipper.android.AndroidSonarClient; -import com.facebook.flipper.core.SonarClient; -import com.facebook.flipper.core.SonarStateUpdateListener; +import com.facebook.flipper.core.FlipperClient; +import com.facebook.flipper.core.FlipperStateUpdateListener; import com.facebook.flipper.core.StateSummary; import com.facebook.flipper.core.StateSummary.StateElement; import android.widget.LinearLayout; @@ -14,7 +14,7 @@ import android.view.View; import android.widget.TextView; import android.widget.ScrollView; -public class SonarDiagnosticActivity extends Activity implements SonarStateUpdateListener { +public class SonarDiagnosticActivity extends Activity implements FlipperStateUpdateListener { private TextView summaryView; private TextView logView; @@ -39,7 +39,7 @@ public class SonarDiagnosticActivity extends Activity implements SonarStateUpdat protected void onStart() { super.onStart(); - final SonarClient client = AndroidSonarClient.getInstance(this); + final FlipperClient client = AndroidSonarClient.getInstance(this); client.subscribeForUpdates(this); summaryView.setText(getSummary()); @@ -85,7 +85,7 @@ public class SonarDiagnosticActivity extends Activity implements SonarStateUpdat protected void onStop() { super.onStop(); - final SonarClient client = AndroidSonarClient.getInstance(this); + final FlipperClient client = AndroidSonarClient.getInstance(this); client.unsubscribe(); } } diff --git a/android/src/main/java/com/facebook/flipper/core/ErrorReportingRunnable.java b/android/src/main/java/com/facebook/flipper/core/ErrorReportingRunnable.java index 722a96f77..77356ea4e 100644 --- a/android/src/main/java/com/facebook/flipper/core/ErrorReportingRunnable.java +++ b/android/src/main/java/com/facebook/flipper/core/ErrorReportingRunnable.java @@ -9,9 +9,9 @@ package com.facebook.flipper.core; public abstract class ErrorReportingRunnable implements Runnable { - private final SonarConnection mConnection; + private final FlipperConnection mConnection; - public ErrorReportingRunnable(SonarConnection connection) { + public ErrorReportingRunnable(FlipperConnection connection) { mConnection = connection; } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarArray.java b/android/src/main/java/com/facebook/flipper/core/FlipperArray.java similarity index 80% rename from android/src/main/java/com/facebook/flipper/core/SonarArray.java rename to android/src/main/java/com/facebook/flipper/core/FlipperArray.java index b5324b9aa..59cffb1a2 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarArray.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperArray.java @@ -13,14 +13,14 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -public class SonarArray { +public class FlipperArray { final JSONArray mJson; - SonarArray(JSONArray json) { + FlipperArray(JSONArray json) { mJson = (json != null ? json : new JSONArray()); } - SonarArray(String json) { + FlipperArray(String json) { try { mJson = new JSONArray(json); } catch (JSONException e) { @@ -28,8 +28,8 @@ public class SonarArray { } } - public SonarDynamic getDynamic(int index) { - return new SonarDynamic(mJson.opt(index)); + public FlipperDynamic getDynamic(int index) { + return new FlipperDynamic(mJson.opt(index)); } public String getString(int index) { @@ -56,14 +56,14 @@ public class SonarArray { return mJson.optBoolean(index); } - public SonarObject getObject(int index) { + public FlipperObject getObject(int index) { final Object o = mJson.opt(index); - return new SonarObject((JSONObject) o); + return new FlipperObject((JSONObject) o); } - public SonarArray getArray(int index) { + public FlipperArray getArray(int index) { final Object o = mJson.opt(index); - return new SonarArray((JSONArray) o); + return new FlipperArray((JSONArray) o); } public int length() { @@ -135,30 +135,30 @@ public class SonarArray { return this; } - public Builder put(SonarValue v) { + public Builder put(FlipperValue v) { return put(v.toSonarObject()); } - public Builder put(SonarArray a) { + public Builder put(FlipperArray a) { mJson.put(a == null ? null : a.mJson); return this; } - public Builder put(SonarArray.Builder b) { + public Builder put(FlipperArray.Builder b) { return put(b.build()); } - public Builder put(SonarObject o) { + public Builder put(FlipperObject o) { mJson.put(o == null ? null : o.mJson); return this; } - public Builder put(SonarObject.Builder b) { + public Builder put(FlipperObject.Builder b) { return put(b.build()); } - public SonarArray build() { - return new SonarArray(mJson); + public FlipperArray build() { + return new FlipperArray(mJson); } } } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarClient.java b/android/src/main/java/com/facebook/flipper/core/FlipperClient.java similarity index 58% rename from android/src/main/java/com/facebook/flipper/core/SonarClient.java rename to android/src/main/java/com/facebook/flipper/core/FlipperClient.java index f6a42e251..c19c42a2e 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarClient.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperClient.java @@ -7,18 +7,18 @@ */ package com.facebook.flipper.core; -public interface SonarClient { - void addPlugin(SonarPlugin plugin); +public interface FlipperClient { + void addPlugin(FlipperPlugin plugin); - T getPlugin(String id); + T getPlugin(String id); - void removePlugin(SonarPlugin plugin); + void removePlugin(FlipperPlugin plugin); void start(); void stop(); - void subscribeForUpdates(SonarStateUpdateListener stateListener); + void subscribeForUpdates(FlipperStateUpdateListener stateListener); void unsubscribe(); diff --git a/android/src/main/java/com/facebook/flipper/core/SonarConnection.java b/android/src/main/java/com/facebook/flipper/core/FlipperConnection.java similarity index 67% rename from android/src/main/java/com/facebook/flipper/core/SonarConnection.java rename to android/src/main/java/com/facebook/flipper/core/FlipperConnection.java index 207c3a58e..8d92bbaaf 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarConnection.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperConnection.java @@ -8,30 +8,30 @@ package com.facebook.flipper.core; /** - * A connection between a SonarPlugin and the desktop Sonar application. Register request handlers + * A connection between a FlipperPlugin and the desktop Sonar application. Register request handlers * to respond to calls made by the desktop application or directly send messages to the desktop * application. */ -public interface SonarConnection { +public interface FlipperConnection { /** * Call a remote method on the Sonar desktop application, passing an optional JSON object as a * parameter. */ - void send(String method, SonarObject params); + void send(String method, FlipperObject params); /** * Call a remote method on the Sonar desktop application, passing an optional JSON array as a * parameter. */ - void send(String method, SonarArray params); + void send(String method, FlipperArray params); /** Report client error */ void reportError(Throwable throwable); /** * Register a receiver for a remote method call issued by the Sonar desktop application. The - * SonarReceiver is passed a responder to respond back to the desktop application. + * FlipperReceiver is passed a responder to respond back to the desktop application. */ - void receive(String method, SonarReceiver receiver); + void receive(String method, FlipperReceiver receiver); } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarDynamic.java b/android/src/main/java/com/facebook/flipper/core/FlipperDynamic.java similarity index 88% rename from android/src/main/java/com/facebook/flipper/core/SonarDynamic.java rename to android/src/main/java/com/facebook/flipper/core/FlipperDynamic.java index f1b4ea1d6..4001cc48f 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarDynamic.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperDynamic.java @@ -11,10 +11,10 @@ import javax.annotation.Nullable; import org.json.JSONArray; import org.json.JSONObject; -public class SonarDynamic { +public class FlipperDynamic { private final Object mObject; - public SonarDynamic(Object object) { + public FlipperDynamic(Object object) { mObject = object; } @@ -108,17 +108,17 @@ public class SonarDynamic { return (Boolean) mObject; } - public SonarObject asObject() { + public FlipperObject asObject() { if (mObject instanceof JSONObject) { - return new SonarObject((JSONObject) mObject); + return new FlipperObject((JSONObject) mObject); } - return (SonarObject) mObject; + return (FlipperObject) mObject; } - public SonarArray asArray() { + public FlipperArray asArray() { if (mObject instanceof JSONArray) { - return new SonarArray((JSONArray) mObject); + return new FlipperArray((JSONArray) mObject); } - return (SonarArray) mObject; + return (FlipperArray) mObject; } } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarObject.java b/android/src/main/java/com/facebook/flipper/core/FlipperObject.java similarity index 76% rename from android/src/main/java/com/facebook/flipper/core/SonarObject.java rename to android/src/main/java/com/facebook/flipper/core/FlipperObject.java index 247cda68d..6d42e7bb1 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarObject.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperObject.java @@ -12,14 +12,14 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -public class SonarObject { +public class FlipperObject { final JSONObject mJson; - public SonarObject(JSONObject json) { + public FlipperObject(JSONObject json) { mJson = (json != null ? json : new JSONObject()); } - public SonarObject(String json) { + public FlipperObject(String json) { try { mJson = new JSONObject(json); } catch (JSONException e) { @@ -27,8 +27,8 @@ public class SonarObject { } } - public SonarDynamic getDynamic(String name) { - return new SonarDynamic(mJson.opt(name)); + public FlipperDynamic getDynamic(String name) { + return new FlipperDynamic(mJson.opt(name)); } public String getString(String name) { @@ -58,14 +58,14 @@ public class SonarObject { return mJson.optBoolean(name); } - public SonarObject getObject(String name) { + public FlipperObject getObject(String name) { final Object o = mJson.opt(name); - return new SonarObject((JSONObject) o); + return new FlipperObject((JSONObject) o); } - public SonarArray getArray(String name) { + public FlipperArray getArray(String name) { final Object o = mJson.opt(name); - return new SonarArray((JSONArray) o); + return new FlipperArray((JSONArray) o); } public boolean contains(String name) { @@ -115,16 +115,16 @@ public class SonarObject { return put(name, (Boolean) obj); } else if (obj instanceof Object[]) { return put(name, Arrays.deepToString((Object[]) obj)); - } else if (obj instanceof SonarObject) { - return put(name, (SonarObject) obj); - } else if (obj instanceof SonarObject.Builder) { - return put(name, (SonarObject.Builder) obj); - } else if (obj instanceof SonarArray) { - return put(name, (SonarArray) obj); - } else if (obj instanceof SonarArray.Builder) { - return put(name, (SonarArray.Builder) obj); - } else if (obj instanceof SonarValue) { - return put(name, ((SonarValue) obj).toSonarObject()); + } else if (obj instanceof FlipperObject) { + return put(name, (FlipperObject) obj); + } else if (obj instanceof FlipperObject.Builder) { + return put(name, (FlipperObject.Builder) obj); + } else if (obj instanceof FlipperArray) { + return put(name, (FlipperArray) obj); + } else if (obj instanceof FlipperArray.Builder) { + return put(name, (FlipperArray.Builder) obj); + } else if (obj instanceof FlipperValue) { + return put(name, ((FlipperValue) obj).toSonarObject()); } else { return put(name, obj.toString()); } @@ -184,11 +184,11 @@ public class SonarObject { return this; } - public Builder put(String name, SonarValue v) { + public Builder put(String name, FlipperValue v) { return put(name, v.toSonarObject()); } - public Builder put(String name, SonarArray a) { + public Builder put(String name, FlipperArray a) { try { mJson.put(name, a == null ? null : a.mJson); } catch (JSONException e) { @@ -197,11 +197,11 @@ public class SonarObject { return this; } - public Builder put(String name, SonarArray.Builder b) { + public Builder put(String name, FlipperArray.Builder b) { return put(name, b.build()); } - public Builder put(String name, SonarObject o) { + public Builder put(String name, FlipperObject o) { try { mJson.put(name, o == null ? null : o.mJson); } catch (JSONException e) { @@ -210,12 +210,12 @@ public class SonarObject { return this; } - public Builder put(String name, SonarObject.Builder b) { + public Builder put(String name, FlipperObject.Builder b) { return put(name, b.build()); } - public SonarObject build() { - return new SonarObject(mJson); + public FlipperObject build() { + return new FlipperObject(mJson); } } } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarPlugin.java b/android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java similarity index 56% rename from android/src/main/java/com/facebook/flipper/core/SonarPlugin.java rename to android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java index dab42a9b2..3781e252a 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java @@ -8,13 +8,13 @@ package com.facebook.flipper.core; /** - * A SonarPlugin is an object which exposes an API to the Desktop Sonar application. When a - * connection is established the plugin is given a SonarConnection on which it can register request - * handlers and send messages. When the SonarConnection is invalid onDisconnect is called. onConnect + * A FlipperPlugin is an object which exposes an API to the Desktop Sonar application. When a + * connection is established the plugin is given a FlipperConnection on which it can register request + * handlers and send messages. When the FlipperConnection is invalid onDisconnect is called. onConnect * may be called again on the same plugin object if Sonar re-connects, this will provide a new - * SonarConnection, do not attempt to re-use the previous connection. + * FlipperConnection, do not attempt to re-use the previous connection. */ -public interface SonarPlugin { +public interface FlipperPlugin { /** * @return The id of this plugin. This is the namespace which Sonar desktop plugins will call @@ -25,12 +25,12 @@ public interface SonarPlugin { /** * Called when a connection has been established. The connection passed to this method is valid - * until {@link SonarPlugin#onDisconnect()} is called. + * until {@link FlipperPlugin#onDisconnect()} is called. */ - void onConnect(SonarConnection connection) throws Exception; + void onConnect(FlipperConnection connection) throws Exception; /** - * Called when the connection passed to {@link SonarPlugin#onConnect(SonarConnection)} is no + * Called when the connection passed to {@link FlipperPlugin#onConnect(FlipperConnection)} is no * longer valid. Do not try to use the connection in or after this method has been called. */ void onDisconnect() throws Exception; diff --git a/android/src/main/java/com/facebook/flipper/core/SonarReceiver.java b/android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java similarity index 86% rename from android/src/main/java/com/facebook/flipper/core/SonarReceiver.java rename to android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java index a06195cde..4f303c399 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarReceiver.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java @@ -11,7 +11,7 @@ package com.facebook.flipper.core; * A receiver of a remote method call issued by the Sonar desktop application. If the given * responder is present it means the Sonar desktop application is expecting a response. */ -public interface SonarReceiver { +public interface FlipperReceiver { /** * Reciver for a request sent from the Sonar desktop client. @@ -21,5 +21,5 @@ public interface SonarReceiver { * through. In this case the request should be made from the desktop using send() instead of * call(). */ - void onReceive(SonarObject params, SonarResponder responder) throws Exception; + void onReceive(FlipperObject params, FlipperResponder responder) throws Exception; } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarResponder.java b/android/src/main/java/com/facebook/flipper/core/FlipperResponder.java similarity index 83% rename from android/src/main/java/com/facebook/flipper/core/SonarResponder.java rename to android/src/main/java/com/facebook/flipper/core/FlipperResponder.java index 939d6f9b0..4b009df6c 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarResponder.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperResponder.java @@ -12,17 +12,17 @@ package com.facebook.flipper.core; * app. The Sonar Responder will automatically wrap the response in an approriate object depending * on if it is an error or not. */ -public interface SonarResponder { +public interface FlipperResponder { /** Deliver a successful response to the Sonar desktop app. */ - void success(SonarObject response); + void success(FlipperObject response); /** Deliver a successful response to the Sonar desktop app. */ - void success(SonarArray response); + void success(FlipperArray response); /** Deliver a successful response to the Sonar desktop app. */ void success(); /** Inform the Sonar desktop app of an error in handling the request. */ - void error(SonarObject response); + void error(FlipperObject response); } diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java b/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java new file mode 100644 index 000000000..747d9eade --- /dev/null +++ b/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java @@ -0,0 +1,12 @@ +package com.facebook.flipper.core; + +public interface FlipperStateUpdateListener { + + /** + * Called when the state of the sonar client changes. + * Typical implementations will subscribe by calling {@link com.facebook.flipper.core.FlipperClient#subscribeForUpdates()}, to start receiving update events. + * Calling {@link com.facebook.flipper.core.FlipperClient#getState()} will retrieve the updated state. + */ + void onUpdate(); + +} diff --git a/android/src/main/java/com/facebook/flipper/core/SonarValue.java b/android/src/main/java/com/facebook/flipper/core/FlipperValue.java similarity index 77% rename from android/src/main/java/com/facebook/flipper/core/SonarValue.java rename to android/src/main/java/com/facebook/flipper/core/FlipperValue.java index 54977ef3b..468fb0c0c 100644 --- a/android/src/main/java/com/facebook/flipper/core/SonarValue.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperValue.java @@ -7,6 +7,6 @@ */ package com.facebook.flipper.core; -public interface SonarValue { - SonarObject toSonarObject(); +public interface FlipperValue { + FlipperObject toSonarObject(); } diff --git a/android/src/main/java/com/facebook/flipper/core/SonarStateUpdateListener.java b/android/src/main/java/com/facebook/flipper/core/SonarStateUpdateListener.java deleted file mode 100644 index e7e42e79b..000000000 --- a/android/src/main/java/com/facebook/flipper/core/SonarStateUpdateListener.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.facebook.flipper.core; - -public interface SonarStateUpdateListener { - - /** - * Called when the state of the sonar client changes. - * Typical implementations will subscribe by calling {@link com.facebook.flipper.core.SonarClient#subscribeForUpdates()}, to start receiving update events. - * Calling {@link com.facebook.flipper.core.SonarClient#getState()} will retrieve the updated state. - */ - void onUpdate(); - -} diff --git a/android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java index 3ce5cf59f..e64d1a7ae 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java @@ -7,26 +7,26 @@ */ package com.facebook.flipper.plugins.common; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarPlugin; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperPlugin; import javax.annotation.Nullable; /** * Sonar plugin that keeps events in a buffer until a connection is available. * - *

In order to send data to the {@link SonarConnection}, use {@link #send(String, SonarObject)} - * instead of {@link SonarConnection#send(String, SonarObject)}. + *

In order to send data to the {@link FlipperConnection}, use {@link #send(String, FlipperObject)} + * instead of {@link FlipperConnection#send(String, FlipperObject)}. */ -public abstract class BufferingSonarPlugin implements SonarPlugin { +public abstract class BufferingSonarPlugin implements FlipperPlugin { private static final int BUFFER_SIZE = 500; private @Nullable RingBuffer mEventQueue; - private @Nullable SonarConnection mConnection; + private @Nullable FlipperConnection mConnection; @Override - public synchronized void onConnect(SonarConnection connection) { + public synchronized void onConnect(FlipperConnection connection) { mConnection = connection; sendBufferedEvents(); @@ -37,7 +37,7 @@ public abstract class BufferingSonarPlugin implements SonarPlugin { mConnection = null; } - public synchronized SonarConnection getConnection() { + public synchronized FlipperConnection getConnection() { return mConnection; } @@ -45,7 +45,7 @@ public abstract class BufferingSonarPlugin implements SonarPlugin { return mConnection != null; } - public synchronized void send(String method, SonarObject sonarObject) { + public synchronized void send(String method, FlipperObject sonarObject) { if (mEventQueue == null) { mEventQueue = new RingBuffer<>(BUFFER_SIZE); } @@ -67,9 +67,9 @@ public abstract class BufferingSonarPlugin implements SonarPlugin { private static class CachedSonarEvent { final String method; - final SonarObject sonarObject; + final FlipperObject sonarObject; - private CachedSonarEvent(String method, SonarObject sonarObject) { + private CachedSonarEvent(String method, FlipperObject sonarObject) { this.method = method; this.sonarObject = sonarObject; } diff --git a/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java b/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java index 63cc9a188..9885a1fde 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java +++ b/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java @@ -10,22 +10,22 @@ package com.facebook.flipper.plugins.common; import android.os.Handler; import android.os.Looper; import com.facebook.flipper.core.ErrorReportingRunnable; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; -public abstract class MainThreadSonarReceiver implements SonarReceiver { +public abstract class MainThreadSonarReceiver implements FlipperReceiver { - public MainThreadSonarReceiver(SonarConnection connection) { + public MainThreadSonarReceiver(FlipperConnection connection) { this.mConnection = connection; } - private final SonarConnection mConnection; + private final FlipperConnection mConnection; private final Handler mHandler = new Handler(Looper.getMainLooper()); @Override - public final void onReceive(final SonarObject params, final SonarResponder responder) { + public final void onReceive(final FlipperObject params, final FlipperResponder responder) { mHandler.post( new ErrorReportingRunnable(mConnection) { @Override @@ -35,6 +35,6 @@ public abstract class MainThreadSonarReceiver implements SonarReceiver { }); } - public abstract void onReceiveOnMainThread(SonarObject params, SonarResponder responder) + public abstract void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) throws Exception; } diff --git a/android/src/main/java/com/facebook/flipper/plugins/console/ConsoleSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/console/ConsoleSonarPlugin.java index 145bfcc36..5354dbb3d 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/console/ConsoleSonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/console/ConsoleSonarPlugin.java @@ -7,11 +7,11 @@ */ package com.facebook.flipper.plugins.console; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarPlugin; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperPlugin; import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver; -public class ConsoleSonarPlugin implements SonarPlugin { +public class ConsoleSonarPlugin implements FlipperPlugin { private final JavascriptEnvironment mJavascriptEnvironment; private JavascriptSession mJavascriptSession; @@ -26,7 +26,7 @@ public class ConsoleSonarPlugin implements SonarPlugin { } @Override - public void onConnect(SonarConnection connection) throws Exception { + public void onConnect(FlipperConnection connection) throws Exception { ConsoleCommandReceiver.listenForCommands(connection, mJavascriptEnvironment); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java b/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java index 24458a507..3cbba5e12 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java +++ b/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java @@ -8,16 +8,16 @@ package com.facebook.flipper.plugins.console.iface; import android.support.annotation.Nullable; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; import com.facebook.flipper.plugins.common.MainThreadSonarReceiver; import org.json.JSONObject; /** * Convenience class for adding console execution to a Sonar Plugin. Calling {@link - * ConsoleCommandReceiver#listenForCommands(SonarConnection, ScriptingEnvironment, ContextProvider)} + * ConsoleCommandReceiver#listenForCommands(FlipperConnection, ScriptingEnvironment, ContextProvider)} * will add the necessary listeners for responding to command execution calls. */ public class ConsoleCommandReceiver { @@ -33,15 +33,15 @@ public class ConsoleCommandReceiver { } public static void listenForCommands( - final SonarConnection connection, + final FlipperConnection connection, final ScriptingEnvironment scriptingEnvironment, final ContextProvider contextProvider) { final ScriptingSession session = scriptingEnvironment.startSession(); - final SonarReceiver executeCommandReceiver = + final FlipperReceiver executeCommandReceiver = new MainThreadSonarReceiver(connection) { @Override - public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) throws Exception { final String command = params.getString("command"); final String contextObjectId = params.getString("context"); @@ -51,18 +51,18 @@ public class ConsoleCommandReceiver { contextObject == null ? session.evaluateCommand(command) : session.evaluateCommand(command, contextObject); - responder.success(new SonarObject(o)); + responder.success(new FlipperObject(o)); } catch (Exception e) { - responder.error(new SonarObject.Builder().put("message", e.getMessage()).build()); + responder.error(new FlipperObject.Builder().put("message", e.getMessage()).build()); } } }; - final SonarReceiver isEnabledReceiver = - new SonarReceiver() { + final FlipperReceiver isEnabledReceiver = + new FlipperReceiver() { @Override - public void onReceive(SonarObject params, SonarResponder responder) throws Exception { + public void onReceive(FlipperObject params, FlipperResponder responder) throws Exception { responder.success( - new SonarObject.Builder() + new FlipperObject.Builder() .put("isEnabled", scriptingEnvironment.isEnabled()) .build()); } @@ -73,7 +73,7 @@ public class ConsoleCommandReceiver { } public static void listenForCommands( - SonarConnection connection, ScriptingEnvironment scriptingEnvironment) { + FlipperConnection connection, ScriptingEnvironment scriptingEnvironment) { listenForCommands(connection, scriptingEnvironment, nullContextProvider); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/DescriptorMapping.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/DescriptorMapping.java index 12dca2999..46415741f 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/DescriptorMapping.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/DescriptorMapping.java @@ -15,7 +15,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.widget.TextView; -import com.facebook.flipper.core.SonarConnection; +import com.facebook.flipper.core.FlipperConnection; import com.facebook.flipper.plugins.inspector.descriptors.ActivityDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.DialogDescriptor; @@ -74,7 +74,7 @@ public class DescriptorMapping { return mMapping.get(clazz); } - void onConnect(SonarConnection connection) { + void onConnect(FlipperConnection connection) { for (NodeDescriptor descriptor : mMapping.values()) { descriptor.setConnection(connection); descriptor.setDescriptorMapping(this); diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java index fe029ec30..5ab27a66a 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java @@ -16,13 +16,13 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import com.facebook.flipper.core.ErrorReportingRunnable; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarPlugin; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperPlugin; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; import com.facebook.flipper.plugins.common.MainThreadSonarReceiver; import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver; import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment; @@ -35,7 +35,7 @@ import java.util.List; import java.util.Stack; import javax.annotation.Nullable; -public class InspectorSonarPlugin implements SonarPlugin { +public class InspectorSonarPlugin implements FlipperPlugin { private ApplicationWrapper mApplication; private DescriptorMapping mDescriptorMapping; @@ -43,7 +43,7 @@ public class InspectorSonarPlugin implements SonarPlugin { private ScriptingEnvironment mScriptingEnvironment; private String mHighlightedId; private TouchOverlayView mTouchOverlay; - private SonarConnection mConnection; + private FlipperConnection mConnection; private @Nullable List mExtensionCommands; private boolean mShowLithoAccessibilitySettings; @@ -51,8 +51,8 @@ public class InspectorSonarPlugin implements SonarPlugin { public interface ExtensionCommand { /** The command to respond to */ String command(); - /** The corresponding SonarReceiver for the command */ - SonarReceiver receiver(ObjectTracker tracker, SonarConnection connection); + /** The corresponding FlipperReceiver for the command */ + FlipperReceiver receiver(ObjectTracker tracker, FlipperConnection connection); } private static Application getAppContextFromContext(Context context) { @@ -121,7 +121,7 @@ public class InspectorSonarPlugin implements SonarPlugin { } @Override - public void onConnect(SonarConnection connection) throws Exception { + public void onConnect(FlipperConnection connection) throws Exception { mConnection = connection; mDescriptorMapping.onConnect(connection); @@ -173,50 +173,50 @@ public class InspectorSonarPlugin implements SonarPlugin { mConnection = null; } - final SonarReceiver mShouldShowLithoAccessibilitySettings = + final FlipperReceiver mShouldShowLithoAccessibilitySettings = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) throws Exception { - responder.success(new SonarObject.Builder().put("showLithoAccessibilitySettings", mShowLithoAccessibilitySettings).build()); + responder.success(new FlipperObject.Builder().put("showLithoAccessibilitySettings", mShowLithoAccessibilitySettings).build()); } }; - final SonarReceiver mGetRoot = + final FlipperReceiver mGetRoot = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) throws Exception { responder.success(getNode(trackObject(mApplication))); } }; - final SonarReceiver mGetAXRoot = + final FlipperReceiver mGetAXRoot = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) throws Exception { // applicationWrapper is not used by accessibility, but is a common ancestor for multiple view roots responder.success(getAXNode(trackObject(mApplication))); } }; - final SonarReceiver mGetNodes = + final FlipperReceiver mGetNodes = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) throws Exception { - final SonarArray ids = params.getArray("ids"); - final SonarArray.Builder result = new SonarArray.Builder(); + final FlipperArray ids = params.getArray("ids"); + final FlipperArray.Builder result = new FlipperArray.Builder(); for (int i = 0, count = ids.length(); i < count; i++) { final String id = ids.getString(i); - final SonarObject node = getNode(id); + final FlipperObject node = getNode(id); if (node != null) { result.put(node); } else { responder.error( - new SonarObject.Builder() + new FlipperObject.Builder() .put("message", "No node with given id") .put("id", id) .build()); @@ -224,17 +224,17 @@ public class InspectorSonarPlugin implements SonarPlugin { } } - responder.success(new SonarObject.Builder().put("elements", result).build()); + responder.success(new FlipperObject.Builder().put("elements", result).build()); } }; - final SonarReceiver mGetAXNodes = + final FlipperReceiver mGetAXNodes = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) throws Exception { - final SonarArray ids = params.getArray("ids"); - final SonarArray.Builder result = new SonarArray.Builder(); + final FlipperArray ids = params.getArray("ids"); + final FlipperArray.Builder result = new FlipperArray.Builder(); // getNodes called to refresh accessibility focus final boolean forAccessibilityEvent = params.getBoolean("forAccessibilityEvent"); @@ -242,7 +242,7 @@ public class InspectorSonarPlugin implements SonarPlugin { for (int i = 0, count = ids.length(); i < count; i++) { final String id = ids.getString(i); - final SonarObject node = getAXNode(id); + final FlipperObject node = getAXNode(id); // sent request for non-existent node, potentially in error if (node == null) { @@ -253,7 +253,7 @@ public class InspectorSonarPlugin implements SonarPlugin { } responder.error( - new SonarObject.Builder() + new FlipperObject.Builder() .put("message", "No accessibility node with given id") .put("id", id) .build()); @@ -273,14 +273,14 @@ public class InspectorSonarPlugin implements SonarPlugin { } } } - responder.success(new SonarObject.Builder().put("elements", result).build()); + responder.success(new FlipperObject.Builder().put("elements", result).build()); } }; - final SonarReceiver mOnRequestAXFocus = + final FlipperReceiver mOnRequestAXFocus = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) throws Exception { final String nodeId = params.getString("id"); @@ -293,15 +293,15 @@ public class InspectorSonarPlugin implements SonarPlugin { } }; - final SonarReceiver mSetData = + final FlipperReceiver mSetData = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder) throws Exception { final String nodeId = params.getString("id"); final boolean ax = params.getBoolean("ax"); - final SonarArray keyPath = params.getArray("path"); - final SonarDynamic value = params.getDynamic("value"); + final FlipperArray keyPath = params.getArray("path"); + final FlipperDynamic value = params.getDynamic("value"); final Object obj = mObjectTracker.get(nodeId); if (obj == null) { @@ -324,10 +324,10 @@ public class InspectorSonarPlugin implements SonarPlugin { } }; - final SonarReceiver mSetHighlighted = + final FlipperReceiver mSetHighlighted = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder) throws Exception { final String nodeId = params.getString("id"); final boolean isAlignmentMode = params.getBoolean("isAlignmentMode"); @@ -343,10 +343,10 @@ public class InspectorSonarPlugin implements SonarPlugin { } }; - final SonarReceiver mSetSearchActive = + final FlipperReceiver mSetSearchActive = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder) throws Exception { final boolean active = params.getBoolean("active"); ApplicationDescriptor.setSearchActive(active); @@ -373,27 +373,27 @@ public class InspectorSonarPlugin implements SonarPlugin { } }; - final SonarReceiver mIsSearchActive = + final FlipperReceiver mIsSearchActive = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(final SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder) throws Exception { - responder.success(new SonarObject.Builder().put("isSearchActive", ApplicationDescriptor.getSearchActive()).build()); + responder.success(new FlipperObject.Builder().put("isSearchActive", ApplicationDescriptor.getSearchActive()).build()); } }; - final SonarReceiver mGetSearchResults = + final FlipperReceiver mGetSearchResults = new MainThreadSonarReceiver(mConnection) { @Override - public void onReceiveOnMainThread(SonarObject params, SonarResponder responder) + public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) throws Exception { final String query = params.getString("query"); final boolean axEnabled = params.getBoolean("axEnabled"); final SearchResultNode matchTree = searchTree(query.toLowerCase(), mApplication, axEnabled); - final SonarObject results = matchTree == null ? null : matchTree.toSonarObject(); - final SonarObject response = - new SonarObject.Builder().put("results", results).put("query", query).build(); + final FlipperObject results = matchTree == null ? null : matchTree.toSonarObject(); + final FlipperObject response = + new FlipperObject.Builder().put("results", results).put("query", query).build(); responder.success(response); } }; @@ -409,7 +409,7 @@ public class InspectorSonarPlugin implements SonarPlugin { // if in layout inspector and talkback is running, override the first click to locate the clicked view if (mConnection != null && AccessibilityUtil.isTalkbackEnabled(getContext()) && event.getPointerCount() == 1) { - SonarObject params = new SonarObject.Builder() + FlipperObject params = new FlipperObject.Builder() .put("type", "usage") .put("eventName", "accessibility:clickToInspectTalkbackRunning").build(); mConnection.send("track", params); @@ -451,7 +451,7 @@ public class InspectorSonarPlugin implements SonarPlugin { } private Touch createTouch(final int touchX, final int touchY, final boolean ax) throws Exception { - final SonarArray.Builder path = new SonarArray.Builder(); + final FlipperArray.Builder path = new FlipperArray.Builder(); path.put(trackObject(mApplication)); return new Touch() { @@ -462,7 +462,7 @@ public class InspectorSonarPlugin implements SonarPlugin { @Override public void finish() { - mConnection.send(ax ? "selectAX" : "select", new SonarObject.Builder().put("path", path).build()); + mConnection.send(ax ? "selectAX" : "select", new FlipperObject.Builder().put("path", path).build()); } @Override @@ -521,8 +521,8 @@ public class InspectorSonarPlugin implements SonarPlugin { descriptor.setHighlighted(obj, highlighted, isAlignmentMode); } - private boolean hasAXNode(SonarObject node) { - SonarObject extraInfo = node.getObject("extraInfo"); + private boolean hasAXNode(FlipperObject node) { + FlipperObject extraInfo = node.getObject("extraInfo"); return extraInfo != null && extraInfo.getBoolean("hasAXNode"); } @@ -544,13 +544,13 @@ public class InspectorSonarPlugin implements SonarPlugin { if (isMatch || childTrees != null) { final String id = trackObject(obj); - SonarObject node = getNode(id); + FlipperObject node = getNode(id); return new SearchResultNode(id, isMatch, node, childTrees, axEnabled && hasAXNode(node) ? getAXNode(id) : null); } return null; } - private @Nullable SonarObject getNode(String id) throws Exception { + private @Nullable FlipperObject getNode(String id) throws Exception { final Object obj = mObjectTracker.get(id); if (obj == null) { return null; @@ -561,7 +561,7 @@ public class InspectorSonarPlugin implements SonarPlugin { return null; } - final SonarArray.Builder children = new SonarArray.Builder(); + final FlipperArray.Builder children = new FlipperArray.Builder(); new ErrorReportingRunnable(mConnection) { @Override protected void runOrThrow() throws Exception { @@ -572,23 +572,23 @@ public class InspectorSonarPlugin implements SonarPlugin { } }.run(); - final SonarObject.Builder data = new SonarObject.Builder(); + final FlipperObject.Builder data = new FlipperObject.Builder(); new ErrorReportingRunnable(mConnection) { @Override protected void runOrThrow() throws Exception { - for (Named props : descriptor.getData(obj)) { + for (Named props : descriptor.getData(obj)) { data.put(props.getName(), props.getValue()); } } }.run(); - final SonarArray.Builder attributes = new SonarArray.Builder(); + final FlipperArray.Builder attributes = new FlipperArray.Builder(); new ErrorReportingRunnable(mConnection) { @Override protected void runOrThrow() throws Exception { for (Named attribute : descriptor.getAttributes(obj)) { attributes.put( - new SonarObject.Builder() + new FlipperObject.Builder() .put("name", attribute.getName()) .put("value", attribute.getValue()) .build()); @@ -596,7 +596,7 @@ public class InspectorSonarPlugin implements SonarPlugin { } }.run(); - return new SonarObject.Builder() + return new FlipperObject.Builder() .put("id", descriptor.getId(obj)) .put("name", descriptor.getName(obj)) .put("data", data) @@ -607,7 +607,7 @@ public class InspectorSonarPlugin implements SonarPlugin { .build(); } - private @Nullable SonarObject getAXNode(String id) throws Exception { + private @Nullable FlipperObject getAXNode(String id) throws Exception { final Object obj = mObjectTracker.get(id); if (obj == null) { @@ -619,7 +619,7 @@ public class InspectorSonarPlugin implements SonarPlugin { return null; } - final SonarArray.Builder children = new SonarArray.Builder(); + final FlipperArray.Builder children = new FlipperArray.Builder(); new ErrorReportingRunnable(mConnection) { @Override protected void runOrThrow() throws Exception { @@ -630,23 +630,23 @@ public class InspectorSonarPlugin implements SonarPlugin { } }.run(); - final SonarObject.Builder data = new SonarObject.Builder(); + final FlipperObject.Builder data = new FlipperObject.Builder(); new ErrorReportingRunnable(mConnection) { @Override protected void runOrThrow() throws Exception { - for (Named props : descriptor.getAXData(obj)) { + for (Named props : descriptor.getAXData(obj)) { data.put(props.getName(), props.getValue()); } } }.run(); - final SonarArray.Builder attributes = new SonarArray.Builder(); + final FlipperArray.Builder attributes = new FlipperArray.Builder(); new ErrorReportingRunnable(mConnection) { @Override protected void runOrThrow() throws Exception { for (Named attribute : descriptor.getAXAttributes(obj)) { attributes.put( - new SonarObject.Builder() + new FlipperObject.Builder() .put("name", attribute.getName()) .put("value", attribute.getValue()) .build()); @@ -657,7 +657,7 @@ public class InspectorSonarPlugin implements SonarPlugin { String name = descriptor.getAXName(obj); name = name.substring(name.lastIndexOf('.') + 1); - return new SonarObject.Builder() + return new FlipperObject.Builder() .put("id", descriptor.getId(obj)) .put("name", name) .put("data", data) diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorValue.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorValue.java index 8e61f3c69..11ae1d540 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorValue.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorValue.java @@ -8,10 +8,10 @@ package com.facebook.flipper.plugins.inspector; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarValue; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperValue; -public class InspectorValue implements SonarValue { +public class InspectorValue implements FlipperValue { /** * Descrive the type of data this value contains. This will influence how values are parsed and @@ -69,8 +69,8 @@ public class InspectorValue implements SonarValue { } @Override - public SonarObject toSonarObject() { - return new SonarObject.Builder() + public FlipperObject toSonarObject() { + return new FlipperObject.Builder() .put("__type__", mType) .put("__mutable__", mMutable) .put("value", mValue) diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java index 499aab867..c5d2c6ba4 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java @@ -8,10 +8,10 @@ package com.facebook.flipper.plugins.inspector; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -22,10 +22,10 @@ import javax.annotation.Nullable; * data can be exposed to the inspector. */ public abstract class NodeDescriptor { - protected SonarConnection mConnection; + protected FlipperConnection mConnection; private DescriptorMapping mDescriptorMapping; - void setConnection(SonarConnection connection) { + void setConnection(FlipperConnection connection) { mConnection = connection; } @@ -52,11 +52,11 @@ public abstract class NodeDescriptor { new ErrorReportingRunnable() { @Override protected void runOrThrow() throws Exception { - SonarArray array = - new SonarArray.Builder() - .put(new SonarObject.Builder().put("id", getId(node)).build()) + FlipperArray array = + new FlipperArray.Builder() + .put(new FlipperObject.Builder().put("id", getId(node)).build()) .build(); - SonarObject params = new SonarObject.Builder().put("nodes", array).build(); + FlipperObject params = new FlipperObject.Builder().put("nodes", array).build(); mConnection.send("invalidate", params); } }.run(); @@ -72,11 +72,11 @@ public abstract class NodeDescriptor { new ErrorReportingRunnable() { @Override protected void runOrThrow() throws Exception { - SonarArray array = - new SonarArray.Builder() - .put(new SonarObject.Builder().put("id", getId(node)).build()) + FlipperArray array = + new FlipperArray.Builder() + .put(new FlipperObject.Builder().put("id", getId(node)).build()) .build(); - SonarObject params = new SonarObject.Builder().put("nodes", array).build(); + FlipperObject params = new FlipperObject.Builder().put("nodes", array).build(); mConnection.send("invalidateAX", params); } }.run(); @@ -137,10 +137,10 @@ public abstract class NodeDescriptor { * Get the data to show for this node in the sidebar of the inspector. The object will be showen * in order and with a header matching the given name. */ - public abstract List> getData(T node) throws Exception; + public abstract List> getData(T node) throws Exception; /** Gets data for AX tree */ - public List> getAXData(T node) throws Exception { + public List> getAXData(T node) throws Exception { return Collections.EMPTY_LIST; } @@ -149,7 +149,7 @@ public abstract class NodeDescriptor { * provided by {@link this#getData(Object)} and the value will be of the same type as the value * mathcing that path in the returned object. */ - public abstract void setValue(T node, String[] path, SonarDynamic value) throws Exception; + public abstract void setValue(T node, String[] path, FlipperDynamic value) throws Exception; /** * Get the attributes for this node. This is a list of read-only string:string mapping which show @@ -205,8 +205,8 @@ public abstract class NodeDescriptor { * other tree or if it is not represented in the other tree bu has children that should show * up, etc. */ - public SonarObject getExtraInfo(T node) { - return new SonarObject.Builder().build(); + public FlipperObject getExtraInfo(T node) { + return new FlipperObject.Builder().build(); } /** diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java index 281d549b8..d07ad83b3 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java @@ -9,21 +9,21 @@ package com.facebook.flipper.plugins.inspector; import android.support.annotation.Nullable; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperObject; import java.util.List; public class SearchResultNode { private final String id; private final boolean isMatch; - private final SonarObject element; - private final SonarObject axElement; + private final FlipperObject element; + private final FlipperObject axElement; @Nullable private final List children; SearchResultNode( - String id, boolean isMatch, SonarObject element, List children, SonarObject axElement) { + String id, boolean isMatch, FlipperObject element, List children, FlipperObject axElement) { this.id = id; this.isMatch = isMatch; this.element = element; @@ -31,10 +31,10 @@ public class SearchResultNode { this.axElement = axElement; } - SonarObject toSonarObject() { - final SonarArray childArray; + FlipperObject toSonarObject() { + final FlipperArray childArray; if (children != null) { - final SonarArray.Builder builder = new SonarArray.Builder(); + final FlipperArray.Builder builder = new FlipperArray.Builder(); for (SearchResultNode child : children) { builder.put(child.toSonarObject()); } @@ -43,7 +43,7 @@ public class SearchResultNode { childArray = null; } - return new SonarObject.Builder() + return new FlipperObject.Builder() .put("id", this.id) .put("isMatch", this.isMatch) .put("axElement", this.axElement) diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ActivityDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ActivityDescriptor.java index 5da49df93..8e2ca959d 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ActivityDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ActivityDescriptor.java @@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; import android.app.Activity; import android.view.Window; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -65,12 +65,12 @@ public class ActivityDescriptor extends NodeDescriptor { } @Override - public List> getData(Activity node) { + public List> getData(Activity node) { return Collections.EMPTY_LIST; } @Override - public void setValue(Activity node, String[] path, SonarDynamic value) throws Exception {} + public void setValue(Activity node, String[] path, FlipperDynamic value) throws Exception {} @Override public List> getAttributes(Activity node) { diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java index b531c0a3b..003c9c90a 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java @@ -13,8 +13,8 @@ import android.support.v4.view.ViewCompat; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.ApplicationWrapper; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; @@ -93,17 +93,17 @@ public class ApplicationDescriptor extends NodeDescriptor { int eventType = event.getEventType(); if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) { mConnection.send("axFocusEvent", - new SonarObject.Builder() + new FlipperObject.Builder() .put("isFocus", true) .build()); } else if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED) { mConnection.send("axFocusEvent", - new SonarObject.Builder() + new FlipperObject.Builder() .put("isFocus", false) .build()); } else if (eventType == AccessibilityEvent.TYPE_VIEW_CLICKED) { mConnection.send("axFocusEvent", - new SonarObject.Builder() + new FlipperObject.Builder() .put("isFocus", false) .put("isClick", true) .build()); @@ -115,7 +115,7 @@ public class ApplicationDescriptor extends NodeDescriptor { }); editedDelegates.add((ViewGroup) view); } else if (hasDelegateAlready) { - SonarObject params = new SonarObject.Builder() + FlipperObject params = new FlipperObject.Builder() .put("type", "usage") .put("eventName", "accessibility:hasDelegateAlready").build(); mConnection.send("track", params); @@ -200,12 +200,12 @@ public class ApplicationDescriptor extends NodeDescriptor { } @Override - public List> getData(ApplicationWrapper node) { + public List> getData(ApplicationWrapper node) { return Collections.EMPTY_LIST; } @Override - public void setValue(ApplicationWrapper node, String[] path, SonarDynamic value) {} + public void setValue(ApplicationWrapper node, String[] path, FlipperDynamic value) {} @Override public List> getAttributes(ApplicationWrapper node) { @@ -213,8 +213,8 @@ public class ApplicationDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(ApplicationWrapper node) { - return new SonarObject.Builder().put("hasAXNode", true).build(); + public FlipperObject getExtraInfo(ApplicationWrapper node) { + return new FlipperObject.Builder().put("hasAXNode", true).build(); } @Override diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogDescriptor.java index c9428d0d6..6ae13e4bd 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogDescriptor.java @@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; import android.app.Dialog; import android.view.Window; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -45,12 +45,12 @@ public class DialogDescriptor extends NodeDescriptor

{ } @Override - public List> getData(Dialog node) { + public List> getData(Dialog node) { return Collections.EMPTY_LIST; } @Override - public void setValue(Dialog node, String[] path, SonarDynamic value) {} + public void setValue(Dialog node, String[] path, FlipperDynamic value) {} @Override public List> getAttributes(Dialog node) { diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogFragmentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogFragmentDescriptor.java index cafa02826..734ee1391 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogFragmentDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogFragmentDescriptor.java @@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; import android.app.Dialog; import android.app.DialogFragment; import android.app.Fragment; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -47,13 +47,13 @@ public class DialogFragmentDescriptor extends NodeDescriptor { } @Override - public List> getData(DialogFragment node) throws Exception { + public List> getData(DialogFragment node) throws Exception { final NodeDescriptor descriptor = descriptorForClass(Fragment.class); return descriptor.getData(node); } @Override - public void setValue(DialogFragment node, String[] path, SonarDynamic value) throws Exception { + public void setValue(DialogFragment node, String[] path, FlipperDynamic value) throws Exception { final NodeDescriptor descriptor = descriptorForClass(Fragment.class); descriptor.setValue(node, path, value); } @@ -65,7 +65,7 @@ public class DialogFragmentDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(DialogFragment node) { + public FlipperObject getExtraInfo(DialogFragment node) { final NodeDescriptor descriptor = descriptorForClass(Fragment.class); return descriptor.getExtraInfo(node); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DrawableDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DrawableDescriptor.java index 956b879e8..929ce2247 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DrawableDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DrawableDescriptor.java @@ -12,8 +12,8 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; import android.view.View; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.HighlightedOverlay; import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.Named; @@ -50,8 +50,8 @@ public class DrawableDescriptor extends NodeDescriptor { } @Override - public List> getData(Drawable node) { - final SonarObject.Builder props = new SonarObject.Builder(); + public List> getData(Drawable node) { + final FlipperObject.Builder props = new FlipperObject.Builder(); final Rect bounds = node.getBounds(); props.put("left", InspectorValue.mutable(bounds.left)); @@ -67,7 +67,7 @@ public class DrawableDescriptor extends NodeDescriptor { } @Override - public void setValue(Drawable node, String[] path, SonarDynamic value) { + public void setValue(Drawable node, String[] path, FlipperDynamic value) { final Rect bounds = node.getBounds(); switch (path[0]) { diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java index dac189b17..2b61ead8c 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java @@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; import android.app.Fragment; import android.os.Bundle; import android.view.View; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -48,13 +48,13 @@ public class FragmentDescriptor extends NodeDescriptor { } @Override - public List> getData(Fragment node) { + public List> getData(Fragment node) { final Bundle args = node.getArguments(); if (args == null || args.isEmpty()) { return Collections.EMPTY_LIST; } - final SonarObject.Builder bundle = new SonarObject.Builder(); + final FlipperObject.Builder bundle = new FlipperObject.Builder(); for (String key : args.keySet()) { bundle.put(key, args.get(key)); @@ -64,7 +64,7 @@ public class FragmentDescriptor extends NodeDescriptor { } @Override - public void setValue(Fragment node, String[] path, SonarDynamic value) {} + public void setValue(Fragment node, String[] path, FlipperDynamic value) {} @Override public List> getAttributes(Fragment node) { @@ -78,8 +78,8 @@ public class FragmentDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(Fragment node) { - return new SonarObject.Builder().put("nonAXWithAXChild", true).build(); + public FlipperObject getExtraInfo(Fragment node) { + return new FlipperObject.Builder().put("nonAXWithAXChild", true).build(); } @Nullable diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ObjectDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ObjectDescriptor.java index 5a667f4a2..12b478542 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ObjectDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ObjectDescriptor.java @@ -8,8 +8,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -43,12 +43,12 @@ public class ObjectDescriptor extends NodeDescriptor { } @Override - public List> getData(Object node) { + public List> getData(Object node) { return Collections.EMPTY_LIST; } @Override - public void setValue(Object node, String[] path, SonarDynamic value) {} + public void setValue(Object node, String[] path, FlipperDynamic value) {} @Override public List> getAttributes(Object node) { diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java index 7d440d0e5..4ce173241 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java @@ -11,8 +11,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; import android.app.Dialog; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -47,13 +47,13 @@ public class SupportDialogFragmentDescriptor extends NodeDescriptor> getData(DialogFragment node) throws Exception { + public List> getData(DialogFragment node) throws Exception { final NodeDescriptor descriptor = descriptorForClass(Fragment.class); return descriptor.getData(node); } @Override - public void setValue(DialogFragment node, String[] path, SonarDynamic value) throws Exception { + public void setValue(DialogFragment node, String[] path, FlipperDynamic value) throws Exception { final NodeDescriptor descriptor = descriptorForClass(Fragment.class); descriptor.setValue(node, path, value); } @@ -65,7 +65,7 @@ public class SupportDialogFragmentDescriptor extends NodeDescriptor { } @Override - public List> getData(Fragment node) { + public List> getData(Fragment node) { final Bundle args = node.getArguments(); if (args == null || args.isEmpty()) { return Collections.EMPTY_LIST; } - final SonarObject.Builder bundle = new SonarObject.Builder(); + final FlipperObject.Builder bundle = new FlipperObject.Builder(); for (String key : args.keySet()) { bundle.put(key, args.get(key)); @@ -64,7 +64,7 @@ public class SupportFragmentDescriptor extends NodeDescriptor { } @Override - public void setValue(Fragment node, String[] path, SonarDynamic value) {} + public void setValue(Fragment node, String[] path, FlipperDynamic value) {} @Override public List> getAttributes(Fragment node) { @@ -79,8 +79,8 @@ public class SupportFragmentDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(Fragment node) { - return new SonarObject.Builder().put("nonAXWithAXChild", true).build(); + public FlipperObject getExtraInfo(Fragment node) { + return new FlipperObject.Builder().put("nonAXWithAXChild", true).build(); } @Override diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/TextViewDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/TextViewDescriptor.java index 3efb0301f..52878879e 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/TextViewDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/TextViewDescriptor.java @@ -14,8 +14,8 @@ import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Text; import android.view.View; import android.widget.TextView; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; @@ -66,15 +66,15 @@ public class TextViewDescriptor extends NodeDescriptor { } @Override - public List> getData(TextView node) throws Exception { - final List> props = new ArrayList<>(); + public List> getData(TextView node) throws Exception { + final List> props = new ArrayList<>(); final NodeDescriptor descriptor = descriptorForClass(View.class); props.add( 0, new Named<>( "TextView", - new SonarObject.Builder() + new FlipperObject.Builder() .put("text", InspectorValue.mutable(Text, node.getText().toString())) .put( "textColor", @@ -88,15 +88,15 @@ public class TextViewDescriptor extends NodeDescriptor { } @Override - public List> getAXData(TextView node) throws Exception { - final List> props = new ArrayList<>(); + public List> getAXData(TextView node) throws Exception { + final List> props = new ArrayList<>(); final NodeDescriptor descriptor = descriptorForClass(View.class); props.addAll(descriptor.getAXData(node)); return props; } @Override - public void setValue(TextView node, String[] path, SonarDynamic value) throws Exception { + public void setValue(TextView node, String[] path, FlipperDynamic value) throws Exception { switch (path[0]) { case "TextView": switch (path[1]) { @@ -132,7 +132,7 @@ public class TextViewDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(TextView node) { + public FlipperObject getExtraInfo(TextView node) { final NodeDescriptor descriptor = descriptorForClass(View.class); return descriptor.getExtraInfo(node); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java index ac220be3f..b1b88c333 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java @@ -29,8 +29,8 @@ import android.view.ViewGroup.MarginLayoutParams; import android.view.ViewParent; import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.HighlightedOverlay; import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.Named; @@ -113,9 +113,9 @@ public class ViewDescriptor extends NodeDescriptor { } @Override - public List> getData(View node) { - final SonarObject.Builder viewProps = - new SonarObject.Builder() + public List> getData(View node) { + final FlipperObject.Builder viewProps = + new FlipperObject.Builder() .put("height", InspectorValue.mutable(node.getHeight())) .put("width", InspectorValue.mutable(node.getWidth())) .put("alpha", InspectorValue.mutable(node.getAlpha())) @@ -126,39 +126,39 @@ public class ViewDescriptor extends NodeDescriptor { .put("layoutParams", getLayoutParams(node)) .put( "state", - new SonarObject.Builder() + new FlipperObject.Builder() .put("enabled", InspectorValue.mutable(node.isEnabled())) .put("activated", InspectorValue.mutable(node.isActivated())) .put("focused", node.isFocused()) .put("selected", InspectorValue.mutable(node.isSelected()))) .put( "bounds", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", InspectorValue.mutable(node.getLeft())) .put("right", InspectorValue.mutable(node.getRight())) .put("top", InspectorValue.mutable(node.getTop())) .put("bottom", InspectorValue.mutable(node.getBottom()))) .put( "padding", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", InspectorValue.mutable(node.getPaddingLeft())) .put("top", InspectorValue.mutable(node.getPaddingTop())) .put("right", InspectorValue.mutable(node.getPaddingRight())) .put("bottom", InspectorValue.mutable(node.getPaddingBottom()))) .put( "rotation", - new SonarObject.Builder() + new FlipperObject.Builder() .put("x", InspectorValue.mutable(node.getRotationX())) .put("y", InspectorValue.mutable(node.getRotationY())) .put("z", InspectorValue.mutable(node.getRotation()))) .put( "scale", - new SonarObject.Builder() + new FlipperObject.Builder() .put("x", InspectorValue.mutable(node.getScaleX())) .put("y", InspectorValue.mutable(node.getScaleY()))) .put( "pivot", - new SonarObject.Builder() + new FlipperObject.Builder() .put("x", InspectorValue.mutable(node.getPivotX())) .put("y", InspectorValue.mutable(node.getPivotY()))); @@ -173,8 +173,8 @@ public class ViewDescriptor extends NodeDescriptor { viewProps.put("elevation", InspectorValue.mutable(node.getElevation())); } - SonarObject.Builder translation = - new SonarObject.Builder() + FlipperObject.Builder translation = + new FlipperObject.Builder() .put("x", InspectorValue.mutable(node.getTranslationX())) .put("y", InspectorValue.mutable(node.getTranslationY())); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { @@ -182,8 +182,8 @@ public class ViewDescriptor extends NodeDescriptor { } viewProps.put("translation", translation); - SonarObject.Builder position = - new SonarObject.Builder() + FlipperObject.Builder position = + new FlipperObject.Builder() .put("x", InspectorValue.mutable(node.getX())) .put("y", InspectorValue.mutable(node.getY())); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { @@ -200,7 +200,7 @@ public class ViewDescriptor extends NodeDescriptor { } @Override - public List> getAXData(View node) { + public List> getAXData(View node) { return Arrays.asList( new Named<>(axNodeInfoPropsTitle, AccessibilityUtil.getAccessibilityNodeInfoData(node)), new Named<>(axTalkbackPropsTitle, AccessibilityUtil.getTalkbackData(node)), @@ -209,7 +209,7 @@ public class ViewDescriptor extends NodeDescriptor { @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) @Override - public void setValue(View node, String[] path, SonarDynamic value) { + public void setValue(View node, String[] path, FlipperDynamic value) { if (path[0].equals(axViewPropsTitle) || path[0].equals(axNodeInfoPropsTitle) || path[0].equals(axTalkbackPropsTitle)) { @@ -381,7 +381,7 @@ public class ViewDescriptor extends NodeDescriptor { invalidate(node); } - private void setAccessibilityValue(View node, String[] path, SonarDynamic value) { + private void setAccessibilityValue(View node, String[] path, FlipperDynamic value) { switch (path[1]) { case "focusable": node.setFocusable(value.asBoolean()); @@ -440,8 +440,8 @@ public class ViewDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(View node) { - return new SonarObject.Builder() + public FlipperObject getExtraInfo(View node) { + return new FlipperObject.Builder() .put("focused", AccessibilityUtil.isAXFocused(node)) .put("hasAXNode", true) .build(); @@ -542,8 +542,8 @@ public class ViewDescriptor extends NodeDescriptor { return objectDescriptor.matches(query, node); } - private SonarObject getTags(final View node) { - final SonarObject.Builder tags = new SonarObject.Builder(); + private FlipperObject getTags(final View node) { + final FlipperObject.Builder tags = new FlipperObject.Builder(); if (sKeyedTagsField == null) { return tags.build(); } @@ -573,9 +573,9 @@ public class ViewDescriptor extends NodeDescriptor { return InspectorValue.mutable(Color, 0); } - private static SonarObject getLayoutParams(View node) { + private static FlipperObject getLayoutParams(View node) { final LayoutParams layoutParams = node.getLayoutParams(); - final SonarObject.Builder params = new SonarObject.Builder(); + final FlipperObject.Builder params = new FlipperObject.Builder(); params.put("width", fromSize(layoutParams.width)); params.put("height", fromSize(layoutParams.height)); @@ -584,7 +584,7 @@ public class ViewDescriptor extends NodeDescriptor { final MarginLayoutParams marginLayoutParams = (MarginLayoutParams) layoutParams; params.put( "margin", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", InspectorValue.mutable(marginLayoutParams.leftMargin)) .put("top", InspectorValue.mutable(marginLayoutParams.topMargin)) .put("right", InspectorValue.mutable(marginLayoutParams.rightMargin)) @@ -606,7 +606,7 @@ public class ViewDescriptor extends NodeDescriptor { return params.build(); } - private void setLayoutParams(View node, String[] path, SonarDynamic value) { + private void setLayoutParams(View node, String[] path, FlipperDynamic value) { final LayoutParams params = node.getLayoutParams(); switch (path[0]) { diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java index 8f048920a..139f225d2 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java @@ -17,8 +17,8 @@ import android.os.Build; import android.view.View; import android.view.ViewGroup; import com.facebook.flipper.R; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.HiddenNode; import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.Named; @@ -153,11 +153,11 @@ public class ViewGroupDescriptor extends NodeDescriptor { } @Override - public List> getData(ViewGroup node) throws Exception { - final List> props = new ArrayList<>(); + public List> getData(ViewGroup node) throws Exception { + final List> props = new ArrayList<>(); final NodeDescriptor descriptor = descriptorForClass(View.class); - final SonarObject.Builder vgProps = new SonarObject.Builder(); + final FlipperObject.Builder vgProps = new FlipperObject.Builder(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { vgProps @@ -183,15 +183,15 @@ public class ViewGroupDescriptor extends NodeDescriptor { } @Override - public List> getAXData(ViewGroup node) throws Exception { - final List> props = new ArrayList<>(); + public List> getAXData(ViewGroup node) throws Exception { + final List> props = new ArrayList<>(); final NodeDescriptor descriptor = descriptorForClass(View.class); props.addAll(descriptor.getAXData(node)); return props; } @Override - public void setValue(ViewGroup node, String[] path, SonarDynamic value) throws Exception { + public void setValue(ViewGroup node, String[] path, FlipperDynamic value) throws Exception { switch (path[0]) { case "ViewGroup": switch (path[1]) { @@ -237,7 +237,7 @@ public class ViewGroupDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(ViewGroup node) { + public FlipperObject getExtraInfo(ViewGroup node) { final NodeDescriptor descriptor = descriptorForClass(View.class); return descriptor.getExtraInfo(node); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/WindowDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/WindowDescriptor.java index b2815c4c9..e04a11812 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/WindowDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/WindowDescriptor.java @@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.inspector.descriptors; import android.view.View; import android.view.Window; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -45,12 +45,12 @@ public class WindowDescriptor extends NodeDescriptor { } @Override - public List> getData(Window node) { + public List> getData(Window node) { return Collections.EMPTY_LIST; } @Override - public void setValue(Window node, String[] path, SonarDynamic value) {} + public void setValue(Window node, String[] path, FlipperDynamic value) {} @Override public List> getAttributes(Window node) { diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java index 6e157870c..d9e8b64e7 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java @@ -21,8 +21,8 @@ import android.view.ViewGroup; import android.view.ViewParent; import android.view.accessibility.AccessibilityManager; import android.widget.EditText; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.InspectorValue; import javax.annotation.Nullable; @@ -511,27 +511,27 @@ public final class AccessibilityUtil { } /** - * Creates a {@link SonarObject} of useful properties of AccessibilityNodeInfo, to be shown in the + * Creates a {@link FlipperObject} of useful properties of AccessibilityNodeInfo, to be shown in the * Sonar Layout Inspector accessibility extension. All properties are immutable since they are all derived from * various {@link View} properties. This is a more complete list than * getAccessibilityNodeInfoProperties returns. * * @param view The {@link View} to derive the AccessibilityNodeInfo properties from. - * @return {@link SonarObject} containing the properties. + * @return {@link FlipperObject} containing the properties. */ @Nullable - public static SonarObject getAccessibilityNodeInfoData(View view) { + public static FlipperObject getAccessibilityNodeInfoData(View view) { final AccessibilityNodeInfoCompat nodeInfo = ViewAccessibilityHelper.createNodeInfoFromView(view); if (nodeInfo == null) { return null; } - final SonarObject.Builder nodeInfoProps = new SonarObject.Builder(); + final FlipperObject.Builder nodeInfoProps = new FlipperObject.Builder(); final Rect bounds = new Rect(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - final SonarArray.Builder actionsArrayBuilder = new SonarArray.Builder(); + final FlipperArray.Builder actionsArrayBuilder = new FlipperArray.Builder(); for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : nodeInfo.getActionList()) { final String actionLabel = (String) action.getLabel(); @@ -571,7 +571,7 @@ public final class AccessibilityUtil { nodeInfo.getBoundsInParent(bounds); nodeInfoProps.put( "parent-bounds", - new SonarObject.Builder() + new FlipperObject.Builder() .put("width", bounds.width()) .put("height", bounds.height()) .put("top", bounds.top) @@ -582,7 +582,7 @@ public final class AccessibilityUtil { nodeInfo.getBoundsInScreen(bounds); nodeInfoProps.put( "screen-bounds", - new SonarObject.Builder() + new FlipperObject.Builder() .put("width", bounds.width()) .put("height", bounds.height()) .put("top", bounds.top) @@ -608,13 +608,13 @@ public final class AccessibilityUtil { } /** - * Modifies a {@link SonarObject.Builder} to add Talkback-specific Accessibiltiy properties to be + * Modifies a {@link FlipperObject.Builder} to add Talkback-specific Accessibiltiy properties to be * shown in the Sonar Layout Inspector. * - * @param props The {@link SonarObject.Builder} to add the properties to. + * @param props The {@link FlipperObject.Builder} to add the properties to. * @param view The {@link View} to derive the properties from. */ - public static void addTalkbackProperties(SonarObject.Builder props, View view) { + public static void addTalkbackProperties(FlipperObject.Builder props, View view) { if (!AccessibilityEvaluationUtil.isTalkbackFocusable(view)) { props .put("talkback-focusable", false) @@ -628,8 +628,8 @@ public final class AccessibilityUtil { } } - public static SonarObject getViewData(View view) { - final SonarObject.Builder props = new SonarObject.Builder(); + public static FlipperObject getViewData(View view) { + final FlipperObject.Builder props = new FlipperObject.Builder(); // This needs to be an empty string to be mutable. See t20470623. CharSequence contentDescription = @@ -656,10 +656,10 @@ public final class AccessibilityUtil { return props.build(); } - public static SonarObject getTalkbackData(View view) { + public static FlipperObject getTalkbackData(View view) { if (!AccessibilityEvaluationUtil.isTalkbackFocusable(view)) { String reason = getTalkbackIgnoredReasons(view); - return new SonarObject.Builder() + return new FlipperObject.Builder() .put("talkback-focusable", false) .put("talkback-ignored-reasons", reason == null ? "" : reason) .build(); @@ -667,7 +667,7 @@ public final class AccessibilityUtil { String reason = getTalkbackFocusableReasons(view); CharSequence description = getTalkbackDescription(view); CharSequence hint = getTalkbackHint(view); - return new SonarObject.Builder() + return new FlipperObject.Builder() .put("talkback-focusable", true) .put("talkback-focusable-reasons", reason) .put("talkback-output", description) diff --git a/android/src/main/java/com/facebook/flipper/plugins/leakcanary/LeakCanarySonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/leakcanary/LeakCanarySonarPlugin.java index 5a137f940..320bf30b9 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/leakcanary/LeakCanarySonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/leakcanary/LeakCanarySonarPlugin.java @@ -9,18 +9,18 @@ package com.facebook.flipper.plugins.leakcanary; import android.util.Log; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarPlugin; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperPlugin; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; import java.util.ArrayList; import java.util.List; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -public class LeakCanarySonarPlugin implements SonarPlugin { +public class LeakCanarySonarPlugin implements FlipperPlugin { private static final String TAG = "LeakCanarySonarPlugin"; @@ -28,7 +28,7 @@ public class LeakCanarySonarPlugin implements SonarPlugin { private static final String CLEAR_EVENT = "clear"; private static final String LEAKS_KEY = "leaks"; - private SonarConnection mConnection; + private FlipperConnection mConnection; private final List leakList = new ArrayList<>(); @@ -38,15 +38,15 @@ public class LeakCanarySonarPlugin implements SonarPlugin { } @Override - public void onConnect(SonarConnection connection) { + public void onConnect(FlipperConnection connection) { mConnection = connection; sendLeakList(); mConnection.receive( CLEAR_EVENT, - new SonarReceiver() { + new FlipperReceiver() { @Override - public void onReceive(SonarObject params, SonarResponder responder) throws Exception { + public void onReceive(FlipperObject params, FlipperResponder responder) throws Exception { leakList.clear(); } }); @@ -62,7 +62,7 @@ public class LeakCanarySonarPlugin implements SonarPlugin { JSONObject obj = new JSONObject(); try { obj.put(LEAKS_KEY, new JSONArray(leakList)); - mConnection.send(REPORT_LEAK_EVENT, new SonarObject(obj)); + mConnection.send(REPORT_LEAK_EVENT, new FlipperObject(obj)); } catch (JSONException e) { Log.w(TAG, "Failure to serialize leak list: ", e); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java b/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java index 1f8cc0242..138aefad5 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java +++ b/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java @@ -10,7 +10,7 @@ package com.facebook.flipper.plugins.leakcanary; import static com.squareup.leakcanary.LeakCanary.leakInfo; import com.facebook.flipper.android.AndroidSonarClient; -import com.facebook.flipper.core.SonarClient; +import com.facebook.flipper.core.FlipperClient; import com.squareup.leakcanary.AbstractAnalysisResultService; import com.squareup.leakcanary.AnalysisResult; import com.squareup.leakcanary.HeapDump; @@ -24,7 +24,7 @@ public class RecordLeakService extends AbstractAnalysisResultService { @Override protected void onHeapAnalyzed(HeapDump heapDump, AnalysisResult result) { final String leakInfo = leakInfo(this, heapDump, result, true); - final SonarClient client = AndroidSonarClient.getInstance(this); + final FlipperClient client = AndroidSonarClient.getInstance(this); if (client != null) { final LeakCanarySonarPlugin plugin = client.getPlugin("LeakCanary"); diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java index aaf1c3a47..80ee604c8 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java @@ -20,8 +20,8 @@ import com.facebook.litho.StateContainer; import com.facebook.litho.annotations.Prop; import com.facebook.litho.annotations.State; import com.facebook.litho.reference.Reference; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.HighlightedOverlay; import com.facebook.flipper.plugins.inspector.InspectorValue; import com.facebook.flipper.plugins.inspector.Named; @@ -45,17 +45,17 @@ import javax.annotation.Nullable; public class DebugComponentDescriptor extends NodeDescriptor { - private Map>> mOverrides = new HashMap<>(); + private Map>> mOverrides = new HashMap<>(); private DebugComponent.Overrider mOverrider = new DebugComponent.Overrider() { @Override public void applyComponentOverrides(String key, Component component) { - final List> overrides = mOverrides.get(key); + final List> overrides = mOverrides.get(key); if (overrides == null) { return; } - for (Pair override : overrides) { + for (Pair override : overrides) { if (override.first[0].equals("Props")) { applyReflectiveOverride(component, override.first[1], override.second); } @@ -65,12 +65,12 @@ public class DebugComponentDescriptor extends NodeDescriptor { @Override public void applyStateOverrides( String key, StateContainer stateContainer) { - final List> overrides = mOverrides.get(key); + final List> overrides = mOverrides.get(key); if (overrides == null) { return; } - for (Pair override : overrides) { + for (Pair override : overrides) { if (override.first[0].equals("State")) { applyReflectiveOverride(stateContainer, override.first[1], override.second); } @@ -79,12 +79,12 @@ public class DebugComponentDescriptor extends NodeDescriptor { @Override public void applyLayoutOverrides(String key, DebugLayoutNode node) { - final List> overrides = mOverrides.get(key); + final List> overrides = mOverrides.get(key); if (overrides == null) { return; } - for (Pair override : overrides) { + for (Pair override : overrides) { if (override.first[0].equals("Layout")) { try { applyLayoutOverride( @@ -141,25 +141,25 @@ public class DebugComponentDescriptor extends NodeDescriptor { } @Override - public List> getData(DebugComponent node) throws Exception { + public List> getData(DebugComponent node) throws Exception { NodeDescriptor componentDescriptor = descriptorForClass(node.getComponent().getClass()); if (componentDescriptor.getClass() != ObjectDescriptor.class) { return componentDescriptor.getData(node.getComponent()); } - final List> data = new ArrayList<>(); + final List> data = new ArrayList<>(); - final SonarObject layoutData = getLayoutData(node); + final FlipperObject layoutData = getLayoutData(node); if (layoutData != null) { data.add(new Named<>("Layout", layoutData)); } - final SonarObject propData = getPropData(node); + final FlipperObject propData = getPropData(node); if (propData != null) { data.add(new Named<>("Props", propData)); } - final SonarObject stateData = getStateData(node); + final FlipperObject stateData = getStateData(node); if (stateData != null) { data.add(new Named<>("State", stateData)); } @@ -168,13 +168,13 @@ public class DebugComponentDescriptor extends NodeDescriptor { } @Nullable - private static SonarObject getLayoutData(DebugComponent node) { + private static FlipperObject getLayoutData(DebugComponent node) { final DebugLayoutNode layout = node.getLayoutNode(); if (layout == null) { return null; } - final SonarObject.Builder data = new SonarObject.Builder(); + final FlipperObject.Builder data = new FlipperObject.Builder(); data.put("background", fromReference(node.getContext(), layout.getBackground())); data.put("foreground", fromDrawable(layout.getForeground())); @@ -203,7 +203,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { data.put( "margin", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", fromYogaValue(layout.getMargin(YogaEdge.LEFT))) .put("top", fromYogaValue(layout.getMargin(YogaEdge.TOP))) .put("right", fromYogaValue(layout.getMargin(YogaEdge.RIGHT))) @@ -216,7 +216,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { data.put( "padding", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", fromYogaValue(layout.getPadding(YogaEdge.LEFT))) .put("top", fromYogaValue(layout.getPadding(YogaEdge.TOP))) .put("right", fromYogaValue(layout.getPadding(YogaEdge.RIGHT))) @@ -229,7 +229,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { data.put( "border", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", fromFloat(layout.getBorderWidth(YogaEdge.LEFT))) .put("top", fromFloat(layout.getBorderWidth(YogaEdge.TOP))) .put("right", fromFloat(layout.getBorderWidth(YogaEdge.RIGHT))) @@ -242,7 +242,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { data.put( "position", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", fromYogaValue(layout.getPosition(YogaEdge.LEFT))) .put("top", fromYogaValue(layout.getPosition(YogaEdge.TOP))) .put("right", fromYogaValue(layout.getPosition(YogaEdge.RIGHT))) @@ -257,13 +257,13 @@ public class DebugComponentDescriptor extends NodeDescriptor { } @Nullable - private static SonarObject getPropData(DebugComponent node) { + private static FlipperObject getPropData(DebugComponent node) { if (node.canResolve()) { return null; } final Component component = node.getComponent(); - final SonarObject.Builder props = new SonarObject.Builder(); + final FlipperObject.Builder props = new FlipperObject.Builder(); boolean hasProps = false; for (Field f : component.getClass().getDeclaredFields()) { @@ -316,7 +316,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { } @Nullable - private static SonarObject getStateData(DebugComponent node) { + private static FlipperObject getStateData(DebugComponent node) { if (node.canResolve()) { return null; } @@ -326,7 +326,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { return null; } - final SonarObject.Builder state = new SonarObject.Builder(); + final FlipperObject.Builder state = new FlipperObject.Builder(); boolean hasState = false; for (Field f : stateContainer.getClass().getDeclaredFields()) { @@ -367,8 +367,8 @@ public class DebugComponentDescriptor extends NodeDescriptor { } @Override - public void setValue(DebugComponent node, String[] path, SonarDynamic value) { - List> overrides = mOverrides.get(node.getGlobalKey()); + public void setValue(DebugComponent node, String[] path, FlipperDynamic value) { + List> overrides = mOverrides.get(node.getGlobalKey()); if (overrides == null) { overrides = new ArrayList<>(); mOverrides.put(node.getGlobalKey(), overrides); @@ -397,8 +397,8 @@ public class DebugComponentDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(DebugComponent node) { - SonarObject.Builder extraInfo = new SonarObject.Builder(); + public FlipperObject getExtraInfo(DebugComponent node) { + FlipperObject.Builder extraInfo = new FlipperObject.Builder(); final NodeDescriptor descriptor = descriptorForClass(View.class); final View hostView = node.getComponentHost(); final View lithoView = node.getLithoView(); @@ -497,7 +497,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { return descriptor.matches(query, node); } - private static void applyLayoutOverride(DebugLayoutNode node, String[] path, SonarDynamic value) { + private static void applyLayoutOverride(DebugLayoutNode node, String[] path, FlipperDynamic value) { switch (path[0]) { case "background": node.setBackgroundColor(value.asInt()); @@ -575,7 +575,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { return YogaEdge.valueOf(s.toUpperCase()); } - private static void applyReflectiveOverride(Object o, String key, SonarDynamic dynamic) { + private static void applyReflectiveOverride(Object o, String key, FlipperDynamic dynamic) { try { final Field field = o.getClass().getDeclaredField(key); field.setAccessible(true); diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java b/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java index 796867b5a..df504f8ca 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java +++ b/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java @@ -5,10 +5,10 @@ package com.facebook.flipper.plugins.litho; import android.view.View; import android.view.ViewGroup; import com.facebook.litho.LithoView; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; import com.facebook.flipper.plugins.common.MainThreadSonarReceiver; import com.facebook.flipper.plugins.inspector.ApplicationWrapper; import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin; @@ -24,10 +24,10 @@ public final class GenerateLithoAccessibilityRenderExtensionCommand implements I } @Override - public SonarReceiver receiver(final ObjectTracker tracker, final SonarConnection connection) { + public FlipperReceiver receiver(final ObjectTracker tracker, final FlipperConnection connection) { return new MainThreadSonarReceiver(connection) { @Override - public void onReceiveOnMainThread(final SonarObject params, final SonarResponder responder) + public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) throws Exception { final String applicationId = params.getString("applicationId"); diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java index 198caf235..27caadb25 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java @@ -6,8 +6,8 @@ import android.graphics.Rect; import android.view.ViewGroup; import com.facebook.litho.DebugComponent; import com.facebook.litho.LithoView; -import com.facebook.flipper.core.SonarDynamic; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperDynamic; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; @@ -68,8 +68,8 @@ public class LithoViewDescriptor extends NodeDescriptor { } @Override - public List> getData(LithoView node) throws Exception { - final List> props = new ArrayList<>(); + public List> getData(LithoView node) throws Exception { + final List> props = new ArrayList<>(); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); final Rect mountedBounds = node.getPreviousMountBounds(); @@ -77,10 +77,10 @@ public class LithoViewDescriptor extends NodeDescriptor { 0, new Named<>( "LithoView", - new SonarObject.Builder() + new FlipperObject.Builder() .put( "mountbounds", - new SonarObject.Builder() + new FlipperObject.Builder() .put("left", mountedBounds.left) .put("top", mountedBounds.top) .put("right", mountedBounds.right) @@ -93,15 +93,15 @@ public class LithoViewDescriptor extends NodeDescriptor { } @Override - public List> getAXData(LithoView node) throws Exception { - final List> props = new ArrayList<>(); + public List> getAXData(LithoView node) throws Exception { + final List> props = new ArrayList<>(); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); props.addAll(descriptor.getAXData(node)); return props; } @Override - public void setValue(LithoView node, String[] path, SonarDynamic value) throws Exception { + public void setValue(LithoView node, String[] path, FlipperDynamic value) throws Exception { final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); descriptor.setValue(node, path, value); } @@ -119,7 +119,7 @@ public class LithoViewDescriptor extends NodeDescriptor { } @Override - public SonarObject getExtraInfo(LithoView node) { + public FlipperObject getExtraInfo(LithoView node) { final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); return descriptor.getExtraInfo(node); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java index 3d2e0531b..6140e8cd5 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java @@ -10,8 +10,8 @@ package com.facebook.flipper.plugins.network; import android.util.Base64; import com.facebook.flipper.core.ErrorReportingRunnable; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarObject; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.plugins.common.BufferingSonarPlugin; import java.util.List; @@ -35,8 +35,8 @@ public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkR @Override public void reportRequest(RequestInfo requestInfo) { - final SonarObject request = - new SonarObject.Builder() + final FlipperObject request = + new FlipperObject.Builder() .put("id", requestInfo.requestId) .put("timestamp", requestInfo.timeStamp) .put("method", requestInfo.method) @@ -58,8 +58,8 @@ public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkR responseInfo.body = null; } - final SonarObject response = - new SonarObject.Builder() + final FlipperObject response = + new FlipperObject.Builder() .put("id", responseInfo.requestId) .put("timestamp", responseInfo.timeStamp) .put("status", responseInfo.statusCode) @@ -99,11 +99,11 @@ public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkR return new String(Base64.encode(bytes, Base64.DEFAULT)); } - private SonarArray toSonarObject(List
headers) { - final SonarArray.Builder list = new SonarArray.Builder(); + private FlipperArray toSonarObject(List
headers) { + final FlipperArray.Builder list = new FlipperArray.Builder(); for (Header header : headers) { - list.put(new SonarObject.Builder().put("key", header.name).put("value", header.value)); + list.put(new FlipperObject.Builder().put("key", header.name).put("value", header.value)); } return list.build(); diff --git a/android/src/main/java/com/facebook/flipper/plugins/sandbox/SandboxSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/sandbox/SandboxSonarPlugin.java index 2cd6c74c4..ec6344336 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/sandbox/SandboxSonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/sandbox/SandboxSonarPlugin.java @@ -7,15 +7,15 @@ */ package com.facebook.flipper.plugins.sandbox; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarPlugin; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperPlugin; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; import java.util.Map; -public class SandboxSonarPlugin implements SonarPlugin { +public class SandboxSonarPlugin implements FlipperPlugin { public static final String ID = "Sandbox"; private static final String SET_METHOD_NAME = "setSandbox"; @@ -33,13 +33,13 @@ public class SandboxSonarPlugin implements SonarPlugin { } @Override - public void onConnect(SonarConnection connection) { + public void onConnect(FlipperConnection connection) { connection.receive( GET_METHOD_NAME, - new SonarReceiver() { + new FlipperReceiver() { @Override - public void onReceive(SonarObject params, final SonarResponder responder) { - final SonarArray.Builder sandboxes = new SonarArray.Builder(); + public void onReceive(FlipperObject params, final FlipperResponder responder) { + final FlipperArray.Builder sandboxes = new FlipperArray.Builder(); Map knownSandboxes = mStrategy.getKnownSandboxes(); if (knownSandboxes == null) { responder.success(sandboxes.build()); @@ -47,7 +47,7 @@ public class SandboxSonarPlugin implements SonarPlugin { } for (String sandboxName : knownSandboxes.keySet()) { sandboxes.put( - new SonarObject.Builder() + new FlipperObject.Builder() .put("name", sandboxName) .put("value", knownSandboxes.get(sandboxName))); } @@ -56,12 +56,12 @@ public class SandboxSonarPlugin implements SonarPlugin { }); connection.receive( SET_METHOD_NAME, - new SonarReceiver() { + new FlipperReceiver() { @Override - public void onReceive(SonarObject params, SonarResponder responder) throws Exception { + public void onReceive(FlipperObject params, FlipperResponder responder) throws Exception { String sandbox = params.getString("sandbox"); mStrategy.setSandbox(sandbox); - responder.success(new SonarObject.Builder().put("result", true).build()); + responder.success(new FlipperObject.Builder().put("result", true).build()); } }); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java index 086fed1a2..de9adf6c8 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java @@ -12,16 +12,16 @@ import static android.content.Context.MODE_PRIVATE; import android.content.Context; import android.content.SharedPreferences; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarPlugin; -import com.facebook.flipper.core.SonarReceiver; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperPlugin; +import com.facebook.flipper.core.FlipperReceiver; +import com.facebook.flipper.core.FlipperResponder; import java.util.Map; -public class SharedPreferencesSonarPlugin implements SonarPlugin { +public class SharedPreferencesSonarPlugin implements FlipperPlugin { - private SonarConnection mConnection; + private FlipperConnection mConnection; private final SharedPreferences mSharedPreferences; private final SharedPreferences.OnSharedPreferenceChangeListener onSharedPreferenceChangeListener = @@ -33,7 +33,7 @@ public class SharedPreferencesSonarPlugin implements SonarPlugin { } mConnection.send( "sharedPreferencesChange", - new SonarObject.Builder() + new FlipperObject.Builder() .put("name", key) .put("deleted", !mSharedPreferences.contains(key)) .put("time", System.currentTimeMillis()) @@ -80,8 +80,8 @@ public class SharedPreferencesSonarPlugin implements SonarPlugin { return "Preferences"; } - private SonarObject getSharedPreferencesObject() { - final SonarObject.Builder builder = new SonarObject.Builder(); + private FlipperObject getSharedPreferencesObject() { + final FlipperObject.Builder builder = new FlipperObject.Builder(); final Map map = mSharedPreferences.getAll(); for (Map.Entry entry : map.entrySet()) { @@ -93,23 +93,23 @@ public class SharedPreferencesSonarPlugin implements SonarPlugin { } @Override - public void onConnect(SonarConnection connection) { + public void onConnect(FlipperConnection connection) { mConnection = connection; connection.receive( "getSharedPreferences", - new SonarReceiver() { + new FlipperReceiver() { @Override - public void onReceive(SonarObject params, SonarResponder responder) { + public void onReceive(FlipperObject params, FlipperResponder responder) { responder.success(getSharedPreferencesObject()); } }); connection.receive( "setSharedPreference", - new SonarReceiver() { + new FlipperReceiver() { @Override - public void onReceive(SonarObject params, SonarResponder responder) + public void onReceive(FlipperObject params, FlipperResponder responder) throws IllegalArgumentException { String preferenceName = params.getString("preferenceName"); diff --git a/android/src/main/java/com/facebook/flipper/testing/SonarConnectionMock.java b/android/src/main/java/com/facebook/flipper/testing/SonarConnectionMock.java index ba3afb602..3e950135a 100644 --- a/android/src/main/java/com/facebook/flipper/testing/SonarConnectionMock.java +++ b/android/src/main/java/com/facebook/flipper/testing/SonarConnectionMock.java @@ -7,21 +7,21 @@ */ package com.facebook.flipper.testing; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarConnection; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarReceiver; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperConnection; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperReceiver; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class SonarConnectionMock implements SonarConnection { - public final Map receivers = new HashMap<>(); +public class SonarConnectionMock implements FlipperConnection { + public final Map receivers = new HashMap<>(); public final Map> sent = new HashMap<>(); @Override - public void send(String method, SonarObject params) { + public void send(String method, FlipperObject params) { final List paramList; if (sent.containsKey(method)) { paramList = sent.get(method); @@ -34,7 +34,7 @@ public class SonarConnectionMock implements SonarConnection { } @Override - public void send(String method, SonarArray params) { + public void send(String method, FlipperArray params) { final List paramList; if (sent.containsKey(method)) { paramList = sent.get(method); @@ -50,7 +50,7 @@ public class SonarConnectionMock implements SonarConnection { public void reportError(Throwable throwable) {} @Override - public void receive(String method, SonarReceiver receiver) { + public void receive(String method, FlipperReceiver receiver) { receivers.put(method, receiver); } } diff --git a/android/src/main/java/com/facebook/flipper/testing/SonarResponderMock.java b/android/src/main/java/com/facebook/flipper/testing/SonarResponderMock.java index 66fb8e6d0..5f6ec64b5 100644 --- a/android/src/main/java/com/facebook/flipper/testing/SonarResponderMock.java +++ b/android/src/main/java/com/facebook/flipper/testing/SonarResponderMock.java @@ -7,33 +7,33 @@ */ package com.facebook.flipper.testing; -import com.facebook.flipper.core.SonarArray; -import com.facebook.flipper.core.SonarObject; -import com.facebook.flipper.core.SonarResponder; +import com.facebook.flipper.core.FlipperArray; +import com.facebook.flipper.core.FlipperObject; +import com.facebook.flipper.core.FlipperResponder; import java.util.LinkedList; import java.util.List; -public class SonarResponderMock implements SonarResponder { +public class SonarResponderMock implements FlipperResponder { public final List successes = new LinkedList<>(); - public final List errors = new LinkedList<>(); + public final List errors = new LinkedList<>(); @Override - public void success(SonarObject response) { + public void success(FlipperObject response) { successes.add(response); } @Override - public void success(SonarArray response) { + public void success(FlipperArray response) { successes.add(response); } @Override public void success() { - successes.add(new SonarObject.Builder().build()); + successes.add(new FlipperObject.Builder().build()); } @Override - public void error(SonarObject response) { + public void error(FlipperObject response) { errors.add(response); } }