From 7dcaf008352d53feeb9ced493adb10d72f9e04c1 Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Fri, 5 May 2023 09:58:07 -0700
Subject: [PATCH] Polish DevServerHelper (#37266)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/37266

This class is full of warnings and other issues which I'm doing a pass on it since I touched it:
- Missing `NonNull` annotations
- Try with resources missing
- Unused inner Interfaces that can be removed

Technically a breaking change for users as we do have some public interfaces that have been removed, though not sure why people would depend on those.

Changelog:
[Android] [Removed] - Polish DevServerHelper (remove unused Interfaces)

Reviewed By: motiz88

Differential Revision: D45600284

fbshipit-source-id: 6274ae29ff3384d7409764fd6474da68d777958a
---
 .../react/devsupport/DevServerHelper.java     | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 58f7f8de0ac..6ee95a79a66 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -9,6 +9,7 @@ package com.facebook.react.devsupport;
 
 import android.content.Context;
 import android.os.AsyncTask;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
@@ -64,10 +65,6 @@ public class DevServerHelper {
 
   private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
 
-  public interface OnServerContentChangeListener {
-    void onServerContentChanged();
-  }
-
   public interface PackagerCommandListener {
     void onPackagerConnected();
 
@@ -84,8 +81,6 @@ public class DevServerHelper {
     Map<String, RequestHandler> customCommandHandlers();
   }
 
-  public interface PackagerCustomCommandProvider {}
-
   private enum BundleType {
     BUNDLE("bundle"),
     MAP("map");
@@ -112,7 +107,7 @@ public class DevServerHelper {
 
   private @Nullable JSPackagerClient mPackagerClient;
   private @Nullable InspectorPackagerConnection mInspectorPackagerConnection;
-  private InspectorPackagerConnection.BundleStatusProvider mBundlerStatusProvider;
+  private final InspectorPackagerConnection.BundleStatusProvider mBundlerStatusProvider;
 
   public DevServerHelper(
       DeveloperSettings developerSettings,
@@ -349,15 +344,14 @@ public class DevServerHelper {
   private String createBundleURL(
       String mainModuleID, BundleType type, String host, boolean modulesOnly, boolean runModule) {
     boolean dev = getDevMode();
-    boolean lazy = dev;
     return String.format(
         Locale.US,
         "http://%s/%s.%s?platform=android&dev=%s&lazy=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s",
         host,
         mainModuleID,
         type.typeID(),
-        dev,
-        lazy,
+        dev, // dev
+        dev, // lazy
         getJSMinifyMode(),
         mPackageName,
         modulesOnly ? "true" : "false",
@@ -405,14 +399,13 @@ public class DevServerHelper {
         .enqueue(
             new Callback() {
               @Override
-              public void onFailure(Call call, IOException e) {
+              public void onFailure(@NonNull Call call, @NonNull IOException e) {
                 // ignore HTTP call response, this is just to open a debugger page and there is no
-                // reason
-                // to report failures from here
+                // reason to report failures from here
               }
 
               @Override
-              public void onResponse(Call call, Response response) throws IOException {
+              public void onResponse(@NonNull Call call, @NonNull Response response) {
                 // ignore HTTP call response - see above
               }
             });
@@ -449,15 +442,9 @@ public class DevServerHelper {
       if (!response.isSuccessful()) {
         return null;
       }
-      Sink output = null;
 
-      try {
-        output = Okio.sink(outputFile);
+      try (Sink output = Okio.sink(outputFile)) {
         Okio.buffer(response.body().source()).readAll(output);
-      } finally {
-        if (output != null) {
-          output.close();
-        }
       }
 
       return outputFile;