Skip to content

Commit

Permalink
Refactor: ReactHost: Remove new prefix from task creation methods (#4…
Browse files Browse the repository at this point in the history
…2169)

Summary:

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D52495531
  • Loading branch information
RSNara authored and facebook-github-bot committed Jan 10, 2024
1 parent dc6c79d commit f1075b9
Showing 1 changed file with 25 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -201,8 +200,7 @@ public LifecycleState getLifecycleState() {
*/
@Override
public TaskInterface<Void> start() {
return Task.call(this::newGetOrCreateStartTask, mBGExecutor).continueWithTask(Task::getResult);

return Task.call(this::getOrCreateStartTask, mBGExecutor).continueWithTask(Task::getResult);
}

/** Initialize and run a React Native surface in a background without mounting real views. */
Expand Down Expand Up @@ -444,17 +442,17 @@ public TaskInterface<Void> reload(String reason) {
log(method, "Waiting for destroy to finish, before reloading React Native.");
reloadTask =
mDestroyTask
.continueWithTask(task -> newGetOrCreateReloadTask(reason), mBGExecutor)
.continueWithTask(task -> getOrCreateReloadTask(reason), mBGExecutor)
.makeVoid();
} else {
reloadTask = newGetOrCreateReloadTask(reason).makeVoid();
reloadTask = getOrCreateReloadTask(reason).makeVoid();
}

return reloadTask.continueWithTask(
task -> {
if (task.isFaulted()) {
mReactHostDelegate.handleInstanceException(task.getError());
return newGetOrCreateDestroyTask("Reload failed", task.getError());
return getOrCreateDestroyTask("Reload failed", task.getError());
}

return task;
Expand Down Expand Up @@ -485,9 +483,9 @@ public TaskInterface<Void> destroy(String reason, @Nullable Exception ex) {
method,
"Reloading React Native. Waiting for reload to finish before destroying React Native.");
return mReloadTask.continueWithTask(
task -> newGetOrCreateDestroyTask(reason, ex), mBGExecutor);
task -> getOrCreateDestroyTask(reason, ex), mBGExecutor);
}
return newGetOrCreateDestroyTask(reason, ex);
return getOrCreateDestroyTask(reason, ex);
},
mBGExecutor)
.continueWithTask(Task::getResult);
Expand Down Expand Up @@ -708,19 +706,19 @@ public void removeBeforeDestroyListener(@NonNull Function0<Unit> onBeforeDestroy
private @Nullable Task<Void> mStartTask = null;

@ThreadConfined("ReactHost")
private Task<Void> newGetOrCreateStartTask() {
private Task<Void> getOrCreateStartTask() {
final String method = "getOrCreateStartTask()";
if (mStartTask == null) {
final String method = "newGetOrCreateStartTask()";
log(method, "Schedule");
mStartTask =
waitThenCallNewGetOrCreateReactInstanceTask()
waitThenCallGetOrCreateReactInstanceTask()
.continueWithTask(
(task) -> {
if (task.isFaulted()) {
mReactHostDelegate.handleInstanceException(task.getError());
// Wait for destroy to finish
return newGetOrCreateDestroyTask(
"newGetOrCreateStartTask() failure: " + task.getError().getMessage(),
return getOrCreateDestroyTask(
"getOrCreateStartTask() failure: " + task.getError().getMessage(),
task.getError())
.continueWithTask(destroyTask -> Task.forError(task.getError()))
.makeVoid();
Expand Down Expand Up @@ -820,19 +818,19 @@ private BridgelessReactContext getOrCreateReactContext() {
* destroying, will wait until destroy is finished, before creating.
*/
private Task<ReactInstance> getOrCreateReactInstance() {
return Task.call(this::waitThenCallNewGetOrCreateReactInstanceTask, mBGExecutor)
return Task.call(this::waitThenCallGetOrCreateReactInstanceTask, mBGExecutor)
.continueWithTask(Task::getResult);
}

@ThreadConfined("ReactHost")
private Task<ReactInstance> waitThenCallNewGetOrCreateReactInstanceTask() {
return waitThenCallNewGetOrCreateReactInstanceTaskWithRetries(0, 4);
private Task<ReactInstance> waitThenCallGetOrCreateReactInstanceTask() {
return waitThenCallGetOrCreateReactInstanceTaskWithRetries(0, 4);
}

@ThreadConfined("ReactHost")
private Task<ReactInstance> waitThenCallNewGetOrCreateReactInstanceTaskWithRetries(
private Task<ReactInstance> waitThenCallGetOrCreateReactInstanceTaskWithRetries(
int tryNum, int maxTries) {
final String method = "waitThenCallNewGetOrCreateReactInstanceTaskWithRetries";
final String method = "waitThenCallGetOrCreateReactInstanceTaskWithRetries";
if (mReloadTask != null) {
log(method, "React Native is reloading. Return reload task.");
return mReloadTask;
Expand All @@ -848,7 +846,7 @@ private Task<ReactInstance> waitThenCallNewGetOrCreateReactInstanceTaskWithRetri
+ tryNum
+ ").");
return mDestroyTask.onSuccessTask(
(task) -> waitThenCallNewGetOrCreateReactInstanceTaskWithRetries(tryNum + 1, maxTries),
(task) -> waitThenCallGetOrCreateReactInstanceTaskWithRetries(tryNum + 1, maxTries),
mBGExecutor);
}

Expand All @@ -857,12 +855,12 @@ private Task<ReactInstance> waitThenCallNewGetOrCreateReactInstanceTaskWithRetri
"React Native is tearing down. Not wait for teardown to finish: reached max retries.");
}

return newGetOrCreateReactInstanceTask();
return getOrCreateReactInstanceTask();
}

@ThreadConfined("ReactHost")
private Task<ReactInstance> newGetOrCreateReactInstanceTask() {
final String method = "newGetOrCreateReactInstanceTask()";
private Task<ReactInstance> getOrCreateReactInstanceTask() {
final String method = "getOrCreateReactInstanceTask()";
log(method);

return mReactInstanceTaskRef.getOrCreate(
Expand Down Expand Up @@ -1152,8 +1150,8 @@ private ReactInstanceTaskUnwrapper createReactInstanceUnwraper(
* ReactInstance task work throws an exception.
*/
@ThreadConfined("ReactHost")
private Task<ReactInstance> newGetOrCreateReloadTask(String reason) {
final String method = "newGetOrCreateReloadTask()";
private Task<ReactInstance> getOrCreateReloadTask(String reason) {
final String method = "getOrCreateReloadTask()";
log(method);

// Log how React Native is destroyed
Expand Down Expand Up @@ -1264,7 +1262,7 @@ private Task<ReactInstance> newGetOrCreateReloadTask(String reason) {
mStartTask = null;

// Kickstart a new ReactInstance create
return newGetOrCreateReactInstanceTask();
return getOrCreateReactInstanceTask();
},
mBGExecutor)
.continueWithTask(
Expand Down Expand Up @@ -1324,8 +1322,8 @@ private Task<ReactInstance> newGetOrCreateReloadTask(String reason) {
* ReactInstance task work throws an exception.
*/
@ThreadConfined("ReactHost")
private Task<Void> newGetOrCreateDestroyTask(final String reason, @Nullable Exception ex) {
final String method = "newGetOrCreateDestroyTask()";
private Task<Void> getOrCreateDestroyTask(final String reason, @Nullable Exception ex) {
final String method = "getOrCreateDestroyTask()";
log(method);

// Log how React Native is destroyed
Expand Down

0 comments on commit f1075b9

Please sign in to comment.