Skip to content

Commit d2bfa55

Browse files
committed
fix: Remove the copy of Function interface, and instead make use of the Function interface now offered as part of minimum API version.
1 parent ec4b353 commit d2bfa55

File tree

10 files changed

+9
-84
lines changed

10 files changed

+9
-84
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.firebase.firestore.core.ComponentProvider;
2222
import com.google.firebase.firestore.model.DatabaseId;
2323
import com.google.firebase.firestore.util.AsyncQueue;
24-
import com.google.firebase.firestore.util.Function;
24+
import com.google.common.base.Function;
2525

2626
/** Gives access to package private methods in integration tests. */
2727
public final class AccessHelper {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.google.android.gms.tasks.Task;
2828
import com.google.android.gms.tasks.TaskCompletionSource;
2929
import com.google.android.gms.tasks.Tasks;
30+
import com.google.common.base.Function;
3031
import com.google.firebase.FirebaseApp;
3132
import com.google.firebase.annotations.PreviewApi;
3233
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
@@ -51,7 +52,6 @@
5152
import com.google.firebase.firestore.util.AsyncQueue;
5253
import com.google.firebase.firestore.util.ByteBufferInputStream;
5354
import com.google.firebase.firestore.util.Executors;
54-
import com.google.firebase.firestore.util.Function;
5555
import com.google.firebase.firestore.util.Logger;
5656
import com.google.firebase.firestore.util.Logger.Level;
5757
import com.google.firebase.firestore.util.Preconditions;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import androidx.annotation.VisibleForTesting;
1919
import androidx.core.util.Consumer;
2020
import com.google.android.gms.tasks.Task;
21+
import com.google.common.base.Function;
2122
import com.google.firebase.firestore.core.FirestoreClient;
2223
import com.google.firebase.firestore.util.AsyncQueue;
23-
import com.google.firebase.firestore.util.Function;
2424
import java.util.concurrent.Executor;
2525

2626
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import android.text.TextUtils;
1818
import androidx.annotation.Nullable;
1919
import com.google.firebase.firestore.model.Document;
20-
import com.google.firebase.firestore.util.Function;
20+
import com.google.common.base.Function;
2121
import java.util.ArrayList;
2222
import java.util.Collections;
2323
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import com.google.firebase.firestore.remote.RemoteSerializer;
4848
import com.google.firebase.firestore.remote.RemoteStore;
4949
import com.google.firebase.firestore.util.AsyncQueue;
50-
import com.google.firebase.firestore.util.Function;
50+
import com.google.common.base.Function;
5151
import com.google.firebase.firestore.util.Logger;
5252
import com.google.firestore.v1.Value;
5353
import java.io.InputStream;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import com.google.firebase.firestore.remote.RemoteStore;
5353
import com.google.firebase.firestore.remote.TargetChange;
5454
import com.google.firebase.firestore.util.AsyncQueue;
55-
import com.google.firebase.firestore.util.Function;
55+
import com.google.common.base.Function;
5656
import com.google.firebase.firestore.util.Logger;
5757
import com.google.firebase.firestore.util.Util;
5858
import com.google.firestore.v1.Value;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.firebase.firestore.util.AsyncQueue;
2525
import com.google.firebase.firestore.util.AsyncQueue.TimerId;
2626
import com.google.firebase.firestore.util.ExponentialBackoff;
27-
import com.google.firebase.firestore.util.Function;
27+
import com.google.common.base.Function;
2828

2929
/** TransactionRunner encapsulates the logic needed to run and retry transactions with backoff. */
3030
public class TransactionRunner<TResult> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.google.firebase.firestore.model.DatabaseId;
3737
import com.google.firebase.firestore.util.Consumer;
3838
import com.google.firebase.firestore.util.FileUtil;
39-
import com.google.firebase.firestore.util.Function;
39+
import com.google.common.base.Function;
4040
import com.google.firebase.firestore.util.Logger;
4141
import com.google.firebase.firestore.util.Supplier;
4242
import java.io.File;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.google.firebase.firestore.model.SnapshotVersion;
3434
import com.google.firebase.firestore.util.BackgroundQueue;
3535
import com.google.firebase.firestore.util.Executors;
36-
import com.google.firebase.firestore.util.Function;
36+
import com.google.common.base.Function;
3737
import com.google.protobuf.InvalidProtocolBufferException;
3838
import com.google.protobuf.MessageLite;
3939
import java.util.ArrayList;

firebase-firestore/src/main/java/com/google/firebase/firestore/util/Function.java

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)