From 079057727ce6f168b669cde1f7a6eee6b305e4f7 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Mon, 24 Sep 2018 07:27:56 -0700 Subject: [PATCH] Rename core references Summary: Only public reference touched is `toSonarObject()`. The controller you requested could not be found. Reviewed By: jknoxville Differential Revision: D10009071 fbshipit-source-id: 985b472403d9ddd8e390620fb7896df93366dbef --- .../java/com/facebook/flipper/core/FlipperArray.java | 2 +- .../com/facebook/flipper/core/FlipperConnection.java | 8 ++++---- .../com/facebook/flipper/core/FlipperObject.java | 4 ++-- .../com/facebook/flipper/core/FlipperPlugin.java | 6 +++--- .../com/facebook/flipper/core/FlipperReceiver.java | 6 +++--- .../com/facebook/flipper/core/FlipperResponder.java | 12 ++++++------ .../java/com/facebook/flipper/core/FlipperValue.java | 2 +- .../plugins/inspector/InspectorFlipperPlugin.java | 2 +- .../flipper/plugins/inspector/InspectorValue.java | 2 +- .../flipper/plugins/inspector/SearchResultNode.java | 4 ++-- .../plugins/network/NetworkFlipperPlugin.java | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperArray.java b/android/src/main/java/com/facebook/flipper/core/FlipperArray.java index 59cffb1a2..2deb5ff6b 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperArray.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperArray.java @@ -136,7 +136,7 @@ public class FlipperArray { } public Builder put(FlipperValue v) { - return put(v.toSonarObject()); + return put(v.toFlipperObject()); } public Builder put(FlipperArray a) { diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperConnection.java b/android/src/main/java/com/facebook/flipper/core/FlipperConnection.java index 8d92bbaaf..5f2a1d04d 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperConnection.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperConnection.java @@ -8,20 +8,20 @@ package com.facebook.flipper.core; /** - * A connection between a FlipperPlugin and the desktop Sonar application. Register request handlers + * A connection between a FlipperPlugin and the desktop Flipper application. Register request handlers * to respond to calls made by the desktop application or directly send messages to the desktop * application. */ public interface FlipperConnection { /** - * Call a remote method on the Sonar desktop application, passing an optional JSON object as a + * Call a remote method on the Flipper desktop application, passing an optional JSON object as a * parameter. */ void send(String method, FlipperObject params); /** - * Call a remote method on the Sonar desktop application, passing an optional JSON array as a + * Call a remote method on the Flipper desktop application, passing an optional JSON array as a * parameter. */ void send(String method, FlipperArray params); @@ -30,7 +30,7 @@ public interface FlipperConnection { void reportError(Throwable throwable); /** - * Register a receiver for a remote method call issued by the Sonar desktop application. The + * Register a receiver for a remote method call issued by the Flipper desktop application. The * FlipperReceiver is passed a responder to respond back to the desktop application. */ void receive(String method, FlipperReceiver receiver); diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperObject.java b/android/src/main/java/com/facebook/flipper/core/FlipperObject.java index 6d42e7bb1..bc9b8b4f4 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperObject.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperObject.java @@ -124,7 +124,7 @@ public class FlipperObject { } else if (obj instanceof FlipperArray.Builder) { return put(name, (FlipperArray.Builder) obj); } else if (obj instanceof FlipperValue) { - return put(name, ((FlipperValue) obj).toSonarObject()); + return put(name, ((FlipperValue) obj).toFlipperObject()); } else { return put(name, obj.toString()); } @@ -185,7 +185,7 @@ public class FlipperObject { } public Builder put(String name, FlipperValue v) { - return put(name, v.toSonarObject()); + return put(name, v.toFlipperObject()); } public Builder put(String name, FlipperArray a) { diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java b/android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java index 3781e252a..00687c61c 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java @@ -8,16 +8,16 @@ package com.facebook.flipper.core; /** - * A FlipperPlugin is an object which exposes an API to the Desktop Sonar application. When a + * A FlipperPlugin is an object which exposes an API to the Desktop Flipper 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 + * may be called again on the same plugin object if Flipper re-connects, this will provide a new * FlipperConnection, do not attempt to re-use the previous connection. */ public interface FlipperPlugin { /** - * @return The id of this plugin. This is the namespace which Sonar desktop plugins will call + * @return The id of this plugin. This is the namespace which Flipper desktop plugins will call * methods on to route them to your plugin. This should match the id specified in your React * plugin. */ diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java b/android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java index 4f303c399..6a0e476fd 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperReceiver.java @@ -8,13 +8,13 @@ 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. + * A receiver of a remote method call issued by the Flipper desktop application. If the given + * responder is present it means the Flipper desktop application is expecting a response. */ public interface FlipperReceiver { /** - * Reciver for a request sent from the Sonar desktop client. + * Reciver for a request sent from the Flipper desktop client. * * @param params Optional set of parameters sent with the request. * @param responder Optional responder for request. Some requests don't warrant a response diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperResponder.java b/android/src/main/java/com/facebook/flipper/core/FlipperResponder.java index 4b009df6c..7f8068337 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperResponder.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperResponder.java @@ -8,21 +8,21 @@ package com.facebook.flipper.core; /** - * FlipperResponder is used to asyncronously response to a messaged recieved from the Sonar desktop - * app. The Sonar Responder will automatically wrap the response in an approriate object depending + * FlipperResponder is used to asyncronously response to a messaged recieved from the Flipper desktop + * app. The Flipper Responder will automatically wrap the response in an approriate object depending * on if it is an error or not. */ public interface FlipperResponder { - /** Deliver a successful response to the Sonar desktop app. */ + /** Deliver a successful response to the Flipper desktop app. */ void success(FlipperObject response); - /** Deliver a successful response to the Sonar desktop app. */ + /** Deliver a successful response to the Flipper desktop app. */ void success(FlipperArray response); - /** Deliver a successful response to the Sonar desktop app. */ + /** Deliver a successful response to the Flipper desktop app. */ void success(); - /** Inform the Sonar desktop app of an error in handling the request. */ + /** Inform the Flipper desktop app of an error in handling the request. */ void error(FlipperObject response); } diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperValue.java b/android/src/main/java/com/facebook/flipper/core/FlipperValue.java index 468fb0c0c..a0a4b3175 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperValue.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperValue.java @@ -8,5 +8,5 @@ package com.facebook.flipper.core; public interface FlipperValue { - FlipperObject toSonarObject(); + FlipperObject toFlipperObject(); } diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java index 061f90a5b..f9147f09a 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java @@ -391,7 +391,7 @@ public class InspectorFlipperPlugin implements FlipperPlugin { final boolean axEnabled = params.getBoolean("axEnabled"); final SearchResultNode matchTree = searchTree(query.toLowerCase(), mApplication, axEnabled); - final FlipperObject results = matchTree == null ? null : matchTree.toSonarObject(); + final FlipperObject results = matchTree == null ? null : matchTree.toFlipperObject(); final FlipperObject response = new FlipperObject.Builder().put("results", results).put("query", query).build(); responder.success(response); 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 11ae1d540..5cce42a00 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 @@ -69,7 +69,7 @@ public class InspectorValue implements FlipperValue { } @Override - public FlipperObject toSonarObject() { + public FlipperObject toFlipperObject() { return new FlipperObject.Builder() .put("__type__", mType) .put("__mutable__", mMutable) 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 d07ad83b3..1e3bd2e3a 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 @@ -31,12 +31,12 @@ public class SearchResultNode { this.axElement = axElement; } - FlipperObject toSonarObject() { + FlipperObject toFlipperObject() { final FlipperArray childArray; if (children != null) { final FlipperArray.Builder builder = new FlipperArray.Builder(); for (SearchResultNode child : children) { - builder.put(child.toSonarObject()); + builder.put(child.toFlipperObject()); } childArray = builder.build(); } else { diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java index dc2500786..401f60e91 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java @@ -41,7 +41,7 @@ public class NetworkFlipperPlugin extends BufferingFlipperPlugin implements Netw .put("timestamp", requestInfo.timeStamp) .put("method", requestInfo.method) .put("url", requestInfo.uri) - .put("headers", toSonarObject(requestInfo.headers)) + .put("headers", toFlipperObject(requestInfo.headers)) .put("data", toBase64(requestInfo.body)) .build(); @@ -64,7 +64,7 @@ public class NetworkFlipperPlugin extends BufferingFlipperPlugin implements Netw .put("timestamp", responseInfo.timeStamp) .put("status", responseInfo.statusCode) .put("reason", responseInfo.statusReason) - .put("headers", toSonarObject(responseInfo.headers)) + .put("headers", toFlipperObject(responseInfo.headers)) .put("data", toBase64(responseInfo.body)) .build(); @@ -99,7 +99,7 @@ public class NetworkFlipperPlugin extends BufferingFlipperPlugin implements Netw return new String(Base64.encode(bytes, Base64.DEFAULT)); } - private FlipperArray toSonarObject(List
headers) { + private FlipperArray toFlipperObject(List
headers) { final FlipperArray.Builder list = new FlipperArray.Builder(); for (Header header : headers) {