From 2ec539acb102b781fba5a2a82afdc6619755e49c Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Fri, 24 Jan 2020 06:58:38 -0800
Subject: [PATCH] Cleanup 3/n

Summary: Same treatment for FlipperReactNativeJavaScriptPlugin.

Reviewed By: mweststrate

Differential Revision: D19471257

fbshipit-source-id: b51d92074ae411c089f0010057f2b61ef6500de0
---
 .../FlipperReactNativeJavaScriptPlugin.java   | 56 +++++++++----------
 ...perReactNativeJavaScriptPluginManager.java |  2 +-
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java b/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java
index 33645da6d..853000bc0 100644
--- a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java
+++ b/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java
@@ -26,63 +26,61 @@ import com.facebook.react.bridge.WritableMap;
  * to the Flipper Desktop client.
  */
 public abstract class FlipperReactNativeJavaScriptPlugin implements FlipperPlugin {
-  String pluginId;
-  boolean inBackground;
-  FlipperConnection connection;
-  FlipperModule module;
+  private final String mPluginId;
+  private final boolean mInBackground;
+  private FlipperConnection mConnection;
+  private FlipperModule mModule;
 
-  public FlipperReactNativeJavaScriptPlugin(
-      FlipperModule module, String pluginId, boolean inBackground) {
-    this.pluginId = pluginId;
-    this.module = module;
-    this.inBackground = inBackground;
-    this.module = module;
+  FlipperReactNativeJavaScriptPlugin(FlipperModule module, String pluginId, boolean inBackground) {
+    mPluginId = pluginId;
+    mModule = module;
+    mInBackground = inBackground;
   }
 
   @Override
   public String getId() {
-    return pluginId;
+    return mPluginId;
   }
 
   @Override
-  public void onConnect(FlipperConnection connection) throws Exception {
-    this.connection = connection;
-    this.fireOnConnect();
+  public void onConnect(FlipperConnection connection) {
+    mConnection = connection;
+    fireOnConnect();
   }
 
-  public void fireOnConnect() {
+  void fireOnConnect() {
     if (!isConnected()) {
-      throw new RuntimeException("Plugin not connected " + pluginId);
+      throw new RuntimeException("Plugin not connected " + mPluginId);
     }
-    this.module.sendJSEvent("react-native-flipper-plugin-connect", getPluginParams());
+    mModule.sendJSEvent("react-native-flipper-plugin-connect", getPluginParams());
   }
 
   @Override
   public void onDisconnect() {
-    this.module.sendJSEvent("react-native-flipper-plugin-disconnect", getPluginParams());
-    this.connection = null;
+    mModule.sendJSEvent("react-native-flipper-plugin-disconnect", getPluginParams());
+    mConnection = null;
   }
 
   @Override
   public boolean runInBackground() {
-    return inBackground;
+    return mInBackground;
   }
 
-  public boolean isConnected() {
-    return connection != null;
+  boolean isConnected() {
+    return mConnection != null;
   }
 
-  public FlipperConnection getConnection() {
-    return connection;
+  FlipperConnection getConnection() {
+    return mConnection;
   }
 
-  public void setModule(FlipperModule module) {
-    this.module = module;
+  void setModule(FlipperModule module) {
+    mModule = module;
   }
 
-  WritableMap getPluginParams() {
-    WritableMap params = Arguments.createMap();
-    params.putString("plugin", pluginId);
+  private WritableMap getPluginParams() {
+    final WritableMap params = Arguments.createMap();
+    params.putString("plugin", mPluginId);
     return params;
   }
 }
diff --git a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java b/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java
index dc84967d2..67f705a81 100644
--- a/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java
+++ b/react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java
@@ -56,7 +56,7 @@ final class FlipperReactNativeJavaScriptPluginManager {
       final String pluginId,
       final Boolean inBackground,
       final Callback statusCallback) {
-    if (this.flipperClient == null) {
+    if (mFlipperClient == null) {
       // Flipper is not available in this build
       statusCallback.invoke("noflipper");
       return;