From 644123aa6fc6132125f56b485e5ab3b16f28f666 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Tue, 6 Feb 2018 15:03:06 -0800
Subject: [PATCH] Consolidate bundle URL creation

Summary:
`DevServerHelper` had multiple places that created bundle URLs.
This consolidates that logic into a single place, and uses an enum for different "bundle types" (bundle, bundle deltas, source maps).

Reviewed By: pakoito

Differential Revision: D6900906

fbshipit-source-id: 64ed9360ea85dc5755308d822d5fc55fe8cb5a55
---
 .../react/devsupport/DevServerHelper.java     | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 73d98a7631e..18034d8b8a3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -106,6 +106,22 @@ public class DevServerHelper {
     void onSymbolicationComplete(@Nullable Iterable<StackFrame> stackFrames);
   }
 
+  private enum BundleType {
+    BUNDLE("bundle"),
+    DELTA("delta"),
+    MAP("map");
+
+    private final String mTypeID;
+
+    BundleType(String typeID) {
+      mTypeID = typeID;
+    }
+
+    public String typeID() {
+      return mTypeID;
+    }
+  }
+
   private final DevInternalSettings mSettings;
   private final OkHttpClient mClient;
   private final Handler mRestartOnChangePollingHandler;
@@ -427,16 +443,20 @@ public class DevServerHelper {
     return mSettings.isJSMinifyEnabled();
   }
 
-  private static String createBundleURL(
-      String host, String jsModulePath, boolean devMode, boolean jsMinify, boolean useDeltas) {
+  private String createBundleURL(String mainModuleID, BundleType type, String host) {
     return String.format(
         Locale.US,
         BUNDLE_URL_FORMAT,
         host,
-        jsModulePath,
-        useDeltas ? "delta" : "bundle",
-        devMode,
-        jsMinify);
+        mainModuleID,
+        type.typeID(),
+        getDevMode(),
+        getJSMinifyMode());
+  }
+
+  private String createBundleURL(String mainModuleID, BundleType type) {
+    return createBundleURL(
+        mainModuleID, type, mSettings.getPackagerConnectionSettings().getDebugServerHost());
   }
 
   private static String createResourceURL(String host, String resourcePath) {
@@ -453,11 +473,10 @@ public class DevServerHelper {
 
   public String getDevServerBundleURL(final String jsModulePath) {
     return createBundleURL(
-        mSettings.getPackagerConnectionSettings().getDebugServerHost(),
-        jsModulePath,
-        getDevMode(),
-        getJSMinifyMode(),
-        mSettings.isBundleDeltasEnabled());
+      jsModulePath,
+      mSettings.isBundleDeltasEnabled() ? BundleType.DELTA : BundleType.BUNDLE,
+      mSettings.getPackagerConnectionSettings().getDebugServerHost()
+    );
   }
 
   public void isPackagerRunning(final PackagerStatusCallback callback) {
@@ -614,25 +633,12 @@ public class DevServerHelper {
   }
 
   public String getSourceMapUrl(String mainModuleName) {
-    return String.format(
-        Locale.US,
-        BUNDLE_URL_FORMAT,
-        mSettings.getPackagerConnectionSettings().getDebugServerHost(),
-        mainModuleName,
-        "map",
-        getDevMode(),
-        getJSMinifyMode());
+    return createBundleURL(mainModuleName, BundleType.MAP);
   }
 
   public String getSourceUrl(String mainModuleName) {
-    return String.format(
-        Locale.US,
-        BUNDLE_URL_FORMAT,
-        mSettings.getPackagerConnectionSettings().getDebugServerHost(),
-        mainModuleName,
-        mSettings.isBundleDeltasEnabled() ? "delta" : "bundle",
-        getDevMode(),
-        getJSMinifyMode());
+    return createBundleURL(
+        mainModuleName, mSettings.isBundleDeltasEnabled() ? BundleType.DELTA : BundleType.BUNDLE);
   }
 
   public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
@@ -640,7 +646,7 @@ public class DevServerHelper {
     // same as the one needed to connect to the same server from the JavaScript proxy running on the
     // host itself.
     return createBundleURL(
-        getHostForJSProxy(), mainModuleName, getDevMode(), getJSMinifyMode(), false);
+      mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
   }
 
   /**