From 0de8860a46960a66af21eb78e7652abf9d871e50 Mon Sep 17 00:00:00 2001 From: Andy Street Date: Fri, 12 Feb 2016 09:09:43 -0800 Subject: [PATCH] Rename executeApplicationScript -> loadApplicationScript Reviewed By: davidaurelio Differential Revision: D2921959 fb-gh-sync-id: 5bf44f5d037f2341000070f59309df0fab72aa29 shipit-source-id: 5bf44f5d037f2341000070f59309df0fab72aa29 --- .../react/bridge/JSDebuggerWebSocketClient.java | 2 +- .../com/facebook/react/bridge/JavaJSExecutor.java | 2 +- .../react/bridge/WebsocketJavaScriptExecutor.java | 6 +++--- ReactAndroid/src/main/jni/react/Bridge.cpp | 4 ++-- ReactAndroid/src/main/jni/react/Bridge.h | 3 ++- ReactAndroid/src/main/jni/react/Executor.h | 2 +- ReactAndroid/src/main/jni/react/JSCExecutor.cpp | 10 +++++----- ReactAndroid/src/main/jni/react/JSCExecutor.h | 2 +- ReactAndroid/src/main/jni/react/jni/OnLoad.cpp | 12 ++++++------ .../src/main/jni/react/jni/ProxyExecutor.cpp | 8 ++++---- .../src/main/jni/react/jni/ProxyExecutor.h | 2 +- .../src/main/jni/react/test/jscexecutor.cpp | 14 +++++++------- .../src/main/jni/react/test/jsclogging.cpp | 2 +- 13 files changed, 35 insertions(+), 34 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java index 13c99c043..849a0ea79 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSDebuggerWebSocketClient.java +++ b/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 injectedObjects, JSDebuggerCallback callback) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java index 5c1b01b22..991fdfb6f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java +++ b/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 diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java index cddadba00..b9e1da2ad 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WebsocketJavaScriptExecutor.java +++ b/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); } } diff --git a/ReactAndroid/src/main/jni/react/Bridge.cpp b/ReactAndroid/src/main/jni/react/Bridge.cpp index 821975bff..5cc7b2151 100644 --- a/ReactAndroid/src/main/jni/react/Bridge.cpp +++ b/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( diff --git a/ReactAndroid/src/main/jni/react/Bridge.h b/ReactAndroid/src/main/jni/react/Bridge.h index adfff7ae0..d649c94fa 100644 --- a/ReactAndroid/src/main/jni/react/Bridge.h +++ b/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. diff --git a/ReactAndroid/src/main/jni/react/Executor.h b/ReactAndroid/src/main/jni/react/Executor.h index beace69a4..8da103630 100644 --- a/ReactAndroid/src/main/jni/react/Executor.h +++ b/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; diff --git a/ReactAndroid/src/main/jni/react/JSCExecutor.cpp b/ReactAndroid/src/main/jni/react/JSCExecutor.cpp index 7815aae25..2398988ba 100644 --- a/ReactAndroid/src/main/jni/react/JSCExecutor.cpp +++ b/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() { diff --git a/ReactAndroid/src/main/jni/react/JSCExecutor.h b/ReactAndroid/src/main/jni/react/JSCExecutor.h index 4db73b058..41558bd4a 100644 --- a/ReactAndroid/src/main/jni/react/JSCExecutor.h +++ b/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( diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index a8dd4a0b5..6fe35d73c 100644 --- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/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& 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; } diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp index d43553a1d..c249f0ad3 100644 --- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp +++ b/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("executeApplicationScript"); + static auto loadApplicationScript = + jni::findClassStatic(EXECUTOR_BASECLASS)->getMethod("loadApplicationScript"); - executeApplicationScript( + loadApplicationScript( m_executor.get(), jni::make_jstring(script).get(), jni::make_jstring(sourceURL).get()); diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h index 1d9b8aebd..c66346424 100644 --- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h +++ b/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( diff --git a/ReactAndroid/src/main/jni/react/test/jscexecutor.cpp b/ReactAndroid/src/main/jni/react/test/jscexecutor.cpp index 9091c1125..1de276f20 100644 --- a/ReactAndroid/src/main/jni/react/test/jscexecutor.cpp +++ b/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 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 args; std::map 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 args; std::vector 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\"," diff --git a/ReactAndroid/src/main/jni/react/test/jsclogging.cpp b/ReactAndroid/src/main/jni/react/test/jsclogging.cpp index 0bf49e33d..56ad010bc 100644 --- a/ReactAndroid/src/main/jni/react/test/jsclogging.cpp +++ b/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); }