Skip to content

Commit de26ef4

Browse files
committed
Rearrange executor order.
1 parent 61a536c commit de26ef4

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ public class FirebaseAppCheckRegistrar implements ComponentRegistrar {
4545

4646
@Override
4747
public List<Component<?>> getComponents() {
48-
Qualified<Executor> backgroundExecutor = Qualified.qualified(Background.class, Executor.class);
4948
Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
49+
Qualified<Executor> backgroundExecutor = Qualified.qualified(Background.class, Executor.class);
5050
Qualified<ScheduledExecutorService> blockingScheduledExecutorService =
5151
Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
5252

5353
return Arrays.asList(
5454
Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
5555
.name(LIBRARY_NAME)
5656
.add(Dependency.required(FirebaseApp.class))
57-
.add(Dependency.required(backgroundExecutor))
5857
.add(Dependency.required(liteExecutor))
58+
.add(Dependency.required(backgroundExecutor))
5959
.add(Dependency.required(blockingScheduledExecutorService))
6060
.add(Dependency.optionalProvider(HeartBeatController.class))
6161
.factory(
6262
(container) ->
6363
new DefaultFirebaseAppCheck(
6464
container.get(FirebaseApp.class),
6565
container.getProvider(HeartBeatController.class),
66-
container.get(backgroundExecutor),
6766
container.get(liteExecutor),
67+
container.get(backgroundExecutor),
6868
container.get(blockingScheduledExecutorService)))
6969
.alwaysEager()
7070
.build(),

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public class DefaultFirebaseAppCheck extends FirebaseAppCheck {
5151
private final List<AppCheckListener> appCheckListenerList;
5252
private final StorageHelper storageHelper;
5353
private final TokenRefreshManager tokenRefreshManager;
54-
private final Executor backgroundExecutor;
5554
private final Executor liteExecutor;
55+
private final Executor backgroundExecutor;
5656
private final Task<Void> retrieveStoredTokenTask;
5757
private final Clock clock;
5858

@@ -63,8 +63,8 @@ public class DefaultFirebaseAppCheck extends FirebaseAppCheck {
6363
public DefaultFirebaseAppCheck(
6464
@NonNull FirebaseApp firebaseApp,
6565
@NonNull Provider<HeartBeatController> heartBeatController,
66-
@Background Executor backgroundExecutor,
6766
@Lightweight Executor liteExecutor,
67+
@Background Executor backgroundExecutor,
6868
@Blocking ScheduledExecutorService scheduledExecutorService) {
6969
checkNotNull(firebaseApp);
7070
checkNotNull(heartBeatController);
@@ -80,8 +80,8 @@ public DefaultFirebaseAppCheck(
8080
/* firebaseAppCheck= */ this,
8181
liteExecutor,
8282
scheduledExecutorService);
83-
this.backgroundExecutor = backgroundExecutor;
8483
this.liteExecutor = liteExecutor;
84+
this.backgroundExecutor = backgroundExecutor;
8585
this.retrieveStoredTokenTask = retrieveStoredAppCheckTokenInBackground(backgroundExecutor);
8686
this.clock = new Clock.DefaultClock();
8787
}

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrarTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void testGetComponents() {
4545
assertThat(firebaseAppCheckComponent.getDependencies())
4646
.containsExactly(
4747
Dependency.required(FirebaseApp.class),
48-
Dependency.required(Qualified.qualified(Background.class, Executor.class)),
4948
Dependency.required(Qualified.qualified(Lightweight.class, Executor.class)),
49+
Dependency.required(Qualified.qualified(Background.class, Executor.class)),
5050
Dependency.required(
5151
Qualified.qualified(Blocking.class, ScheduledExecutorService.class)),
5252
Dependency.optionalProvider(HeartBeatController.class));

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public void testConstructor_nullFirebaseApp_expectThrows() {
9595
new DefaultFirebaseAppCheck(
9696
null,
9797
() -> mockHeartBeatController,
98-
TestOnlyExecutors.background(),
9998
TestOnlyExecutors.lite(),
99+
TestOnlyExecutors.background(),
100100
TestOnlyExecutors.blocking());
101101
});
102102
}
@@ -109,8 +109,8 @@ public void testConstructor_nullHeartBeatControllerProvider_expectThrows() {
109109
new DefaultFirebaseAppCheck(
110110
mockFirebaseApp,
111111
null,
112-
TestOnlyExecutors.background(),
113112
TestOnlyExecutors.lite(),
113+
TestOnlyExecutors.background(),
114114
TestOnlyExecutors.blocking());
115115
});
116116
}

0 commit comments

Comments
 (0)