Skip to content

Commit 32cfc69

Browse files
committed
Change the api to match the update
1 parent 87e3ac1 commit 32cfc69

File tree

5 files changed

+29
-14
lines changed

5 files changed

+29
-14
lines changed

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,15 @@ public void testAutomaticIndexingSetSuccessfully() {
112112
.setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
113113
.build();
114114
db.setFirestoreSettings(settings);
115-
assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(true));
116-
assertDoesNotThrow(
117-
() -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(false));
115+
assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().enableIndexAutoCreation());
116+
assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().disableIndexAutoCreation());
118117
}
119118

120119
@Test
121120
public void testAutomaticIndexingSetSuccessfullyUseDefault() {
122121
// Use persistent disk cache (default)
123122
FirebaseFirestore db = testFirestore();
124-
assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(true));
125-
assertDoesNotThrow(
126-
() -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(false));
123+
assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().enableIndexAutoCreation());
124+
assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().disableIndexAutoCreation());
127125
}
128126
}

firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheIndexManager.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ public PersistentCacheIndexManager(FirestoreClient client) {
2929
this.client = client;
3030
}
3131

32-
public void setAutomaticIndexingEnabled(boolean isEnabled) {
33-
client.setAutomaticIndexingEnabled(isEnabled);
32+
public void enableIndexAutoCreation() {
33+
client.enableIndexAutoCreation();
34+
}
35+
36+
public void disableIndexAutoCreation() {
37+
client.disableIndexAutoCreation();
3438
}
3539
}

firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,14 @@ public Task<Void> configureFieldIndexes(List<FieldIndex> fieldIndices) {
353353
return asyncQueue.enqueue(() -> localStore.configureFieldIndexes(fieldIndices));
354354
}
355355

356-
public void setAutomaticIndexingEnabled(boolean isEnabled) {
356+
public void enableIndexAutoCreation() {
357357
verifyNotTerminated();
358-
asyncQueue.enqueueAndForget(() -> localStore.setAutomaticIndexingEnabled(isEnabled));
358+
asyncQueue.enqueueAndForget(() -> localStore.enableIndexAutoCreation());
359+
}
360+
361+
public void disableIndexAutoCreation() {
362+
verifyNotTerminated();
363+
asyncQueue.enqueueAndForget(() -> localStore.disableIndexAutoCreation());
359364
}
360365

361366
public void removeSnapshotsInSyncListener(EventListener<Void> listener) {

firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,12 @@ public void configureFieldIndexes(List<FieldIndex> newFieldIndexes) {
802802
});
803803
}
804804

805-
public void setAutomaticIndexingEnabled(boolean isEnabled) {
806-
queryEngine.setAutomaticIndexingEnabled(isEnabled);
805+
public void enableIndexAutoCreation() {
806+
queryEngine.enableIndexAutoCreation();
807+
}
808+
809+
public void disableIndexAutoCreation() {
810+
queryEngine.disableIndexAutoCreation();
807811
}
808812

809813
/** Mutable state for the transaction in allocateQuery. */

firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryEngine.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@ public void initialize(LocalDocumentsView localDocumentsView, IndexManager index
7373
this.initialized = true;
7474
}
7575

76-
public void setAutomaticIndexingEnabled(boolean isEnabled) {
77-
this.automaticIndexingEnabled = isEnabled;
76+
public void enableIndexAutoCreation() {
77+
this.automaticIndexingEnabled = true;
78+
}
79+
80+
public void disableIndexAutoCreation() {
81+
this.automaticIndexingEnabled = false;
7882
}
7983

8084
public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(

0 commit comments

Comments
 (0)