Rename executeApplicationScript -> loadApplicationScript

Reviewed By: davidaurelio

Differential Revision: D2921959

fb-gh-sync-id: 5bf44f5d037f2341000070f59309df0fab72aa29
shipit-source-id: 5bf44f5d037f2341000070f59309df0fab72aa29

ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java

@@ -103,7 +103,7 @@ public class JSDebuggerWebSocketClient implements WebSocketListener {
     }
   }
 
-  public void executeApplicationScript(
+  public void loadApplicationScript(
       String sourceURL,
       HashMap<String, String> injectedObjects,
       JSDebuggerCallback callback) {

ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java

@@ -40,7 +40,7 @@ public interface JavaJSExecutor {
    * @param sourceURL url or file location from which script content was loaded
    */
   @DoNotStrip
-  void executeApplicationScript(String script, String sourceURL) throws ProxyExecutorException;
+  void loadApplicationScript(String script, String sourceURL) throws ProxyExecutorException;
 
   /**
    * Execute javascript method within js context

ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java

@@ -159,10 +159,10 @@ public class WebsocketJavaScriptExecutor implements JavaJSExecutor {
   }
 
   @Override
-  public void executeApplicationScript(String script, String sourceURL)
+  public void loadApplicationScript(String script, String sourceURL)
       throws ProxyExecutorException {
     JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture();
-    Assertions.assertNotNull(mWebSocketClient).executeApplicationScript(
+    Assertions.assertNotNull(mWebSocketClient).loadApplicationScript(
         sourceURL,
         mInjectedObjects,
         callback);
@@ -190,7 +190,7 @@ public class WebsocketJavaScriptExecutor implements JavaJSExecutor {
 
   @Override
   public void setGlobalVariable(String propertyName, String jsonEncodedValue) {
-    // Store and use in the next executeApplicationScript() call.
+    // Store and use in the next loadApplicationScript() call.
     mInjectedObjects.put(propertyName, jsonEncodedValue);
   }
 }

ReactAndroid/src/main/jni/react/Bridge.cpp

@@ -22,8 +22,8 @@ Bridge::~Bridge() {
   m_jsExecutor.reset();
 }
 
-void Bridge::executeApplicationScript(const std::string& script, const std::string& sourceURL) {
-  m_jsExecutor->executeApplicationScript(script, sourceURL);
+void Bridge::loadApplicationScript(const std::string& script, const std::string& sourceURL) {
+  m_jsExecutor->loadApplicationScript(script, sourceURL);
 }
 
 void Bridge::loadApplicationUnbundle(

ReactAndroid/src/main/jni/react/Bridge.h

@@ -43,7 +43,8 @@ public:
    * contains code for all modules and a runtime that resolves and
    * executes modules.
    */
-  void executeApplicationScript(const std::string& script, const std::string& sourceURL);
+  void loadApplicationScript(const std::string& script, const std::string& sourceURL);
+
   /**
    * Starts the JS application from an "unbundle", i.e. a backend that stores
    * and injects each module as individual file.

ReactAndroid/src/main/jni/react/Executor.h

@@ -30,7 +30,7 @@ public:
   /**
    * Execute an application script bundle in the JS context.
    */
-  virtual void executeApplicationScript(
+  virtual void loadApplicationScript(
     const std::string& script,
     const std::string& sourceURL) = 0;
 

ReactAndroid/src/main/jni/react/JSCExecutor.cpp

@@ -128,16 +128,16 @@ JSCExecutor::~JSCExecutor() {
   JSGlobalContextRelease(m_context);
 }
 
-void JSCExecutor::executeApplicationScript(
+void JSCExecutor::loadApplicationScript(
     const std::string& script,
     const std::string& sourceURL) {
-  ReactMarker::logMarker("executeApplicationScript_startStringConvert");
+  ReactMarker::logMarker("loadApplicationScript_startStringConvert");
   String jsScript = String::createExpectingAscii(script);
-  ReactMarker::logMarker("executeApplicationScript_endStringConvert");
+  ReactMarker::logMarker("loadApplicationScript_endStringConvert");
 
   String jsSourceURL(sourceURL.c_str());
   #ifdef WITH_FBSYSTRACE
-  FbSystraceSection s(TRACE_TAG_REACT_CXX_BRIDGE, "JSCExecutor::executeApplicationScript",
+  FbSystraceSection s(TRACE_TAG_REACT_CXX_BRIDGE, "JSCExecutor::loadApplicationScript",
     "sourceURL", sourceURL);
   #endif
   if (!jsSourceURL) {
@@ -158,7 +158,7 @@ void JSCExecutor::loadApplicationUnbundle(
     installGlobalFunction(m_context, "nativeRequire", nativeRequire);
   }
   m_unbundle = std::move(unbundle);
-  executeApplicationScript(startupCode, sourceURL);
+  loadApplicationScript(startupCode, sourceURL);
 }
 
 void JSCExecutor::flush() {

ReactAndroid/src/main/jni/react/JSCExecutor.h

@@ -31,7 +31,7 @@ public:
   explicit JSCExecutor(Bridge *bridge, const std::string& cacheDir);
   ~JSCExecutor() override;
 
-  virtual void executeApplicationScript(
+  virtual void loadApplicationScript(
     const std::string& script,
     const std::string& sourceURL) override;
   virtual void loadApplicationUnbundle(

ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

@@ -651,12 +651,12 @@ static void create(JNIEnv* env, jobject obj, jobject executor, jobject callback,
   setCountableForJava(env, obj, std::move(bridge));
 }
 
-static void executeApplicationScript(
+static void loadApplicationScript(
     const RefPtr<CountableBridge>& bridge,
     const std::string& script,
     const std::string& sourceUri) {
   try {
-    bridge->executeApplicationScript(script, sourceUri);
+    bridge->loadApplicationScript(script, sourceUri);
   } catch (...) {
     translatePendingCppExceptionToJavaException();
   }
@@ -689,7 +689,7 @@ static void loadScriptFromAssets(JNIEnv* env, jobject obj, jobject assetManager,
   auto script = react::loadScriptFromAssets(manager, assetNameStr);
   #ifdef WITH_FBSYSTRACE
   FbSystraceSection s(TRACE_TAG_REACT_CXX_BRIDGE, "reactbridge_jni_"
-    "executeApplicationScript",
+    "loadApplicationScript",
     "assetName", assetNameStr);
   #endif
 
@@ -697,7 +697,7 @@ static void loadScriptFromAssets(JNIEnv* env, jobject obj, jobject assetManager,
   if (JniJSModulesUnbundle::isUnbundle(manager, assetNameStr)) {
     loadApplicationUnbundle(bridge, manager, script, "file://" + assetNameStr);
   } else {
-    executeApplicationScript(bridge, script, "file://" + assetNameStr);
+    loadApplicationScript(bridge, script, "file://" + assetNameStr);
   }
   if (env->ExceptionCheck()) {
     return;
@@ -715,11 +715,11 @@ static void loadScriptFromFile(JNIEnv* env, jobject obj, jstring fileName, jstri
   #ifdef WITH_FBSYSTRACE
   auto sourceURLStr = sourceURL == NULL ? fileNameStr : fromJString(env, sourceURL);
   FbSystraceSection s(TRACE_TAG_REACT_CXX_BRIDGE, "reactbridge_jni_"
-    "executeApplicationScript",
+    "loadApplicationScript",
     "sourceURL", sourceURLStr);
   #endif
   env->CallStaticVoidMethod(markerClass, gLogMarkerMethod, env->NewStringUTF("loadScriptFromFile_read"));
-  executeApplicationScript(bridge, script, jni::fromJString(env, sourceURL));
+  loadApplicationScript(bridge, script, jni::fromJString(env, sourceURL));
   if (env->ExceptionCheck()) {
     return;
   }

ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp

@@ -40,13 +40,13 @@ ProxyExecutor::~ProxyExecutor() {
   m_executor.reset();
 }
 
-void ProxyExecutor::executeApplicationScript(
+void ProxyExecutor::loadApplicationScript(
     const std::string& script,
     const std::string& sourceURL) {
-  static auto executeApplicationScript =
-    jni::findClassStatic(EXECUTOR_BASECLASS)->getMethod<void(jstring, jstring)>("executeApplicationScript");
+  static auto loadApplicationScript =
+    jni::findClassStatic(EXECUTOR_BASECLASS)->getMethod<void(jstring, jstring)>("loadApplicationScript");
 
-  executeApplicationScript(
+  loadApplicationScript(
     m_executor.get(),
     jni::make_jstring(script).get(),
     jni::make_jstring(sourceURL).get());

ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h

@@ -31,7 +31,7 @@ public:
     m_executor(std::move(executorInstance)),
     m_bridge(bridge) {}
   virtual ~ProxyExecutor() override;
-  virtual void executeApplicationScript(
+  virtual void loadApplicationScript(
     const std::string& script,
     const std::string& sourceURL) override;
   virtual void loadApplicationUnbundle(

ReactAndroid/src/main/jni/react/test/jscexecutor.cpp

@@ -33,7 +33,7 @@ TEST(JSCExecutor, CallFunction) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   std::vector<MethodArgument> args;
   args.emplace_back(true);
   args.emplace_back(0.4);
@@ -62,7 +62,7 @@ TEST(JSCExecutor, CallFunctionWithMap) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   std::vector<MethodArgument> args;
   std::map<std::string, MethodArgument> map {
     { "foo", MethodArgument("hello") },
@@ -89,7 +89,7 @@ TEST(JSCExecutor, CallFunctionReturningMap) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   auto returnedCalls = executeForMethodCalls(e, 10, 9);
   ASSERT_EQ(1, returnedCalls.size());
   auto returnedCall = returnedCalls[0];
@@ -115,7 +115,7 @@ TEST(JSCExecutor, CallFunctionWithArray) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   std::vector<MethodArgument> args;
   std::vector<MethodArgument> array {
     MethodArgument("hello"),
@@ -142,7 +142,7 @@ TEST(JSCExecutor, CallFunctionReturningNumberArray) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   auto returnedCalls = executeForMethodCalls(e, 10, 9);
   ASSERT_EQ(1, returnedCalls.size());
   auto returnedCall = returnedCalls[0];
@@ -165,7 +165,7 @@ TEST(JSCExecutor, SetSimpleGlobalVariable) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   e.setGlobalVariable("__foo", "42");
   auto returnedCalls = executeForMethodCalls(e, 10, 9);
   ASSERT_EQ(1, returnedCalls.size());
@@ -185,7 +185,7 @@ TEST(JSCExecutor, SetObjectGlobalVariable) {
   "function require() { return Bridge; }"
   "";
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
   auto jsonObject = ""
   "{"
   "  \"foo\": \"hello\","

ReactAndroid/src/main/jni/react/test/jsclogging.cpp

@@ -38,7 +38,7 @@ TEST_F(JSCLoggingTest, LogException) {
   expectedLogMessageSubstring = "I am a banana!";
 
   JSCExecutor e;
-  e.executeApplicationScript(jsText, "");
+  e.loadApplicationScript(jsText, "");
 
   ASSERT_TRUE(hasSeenExpectedLogMessage);
 }