Remove the copy of Guava Function interface

firebase-firestore/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [fixed] Remove copy of Guava Function interface, and instead use Guava directly. [#6983](//github.com/firebase/firebase-android-sdk/pull/6983)
 
 # 25.1.4
 * [fixed] Fixed the `null` value handling in `whereNotEqualTo` and `whereNotIn` filters.

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

@@ -15,13 +15,13 @@
 package com.google.firebase.firestore;
 
 import android.content.Context;
+import com.google.common.base.Function;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.firestore.auth.CredentialsProvider;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.ComponentProvider;
 import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.util.AsyncQueue;
-import com.google.firebase.firestore.util.Function;
 
 /** Gives access to package private methods in integration tests. */
 public final class AccessHelper {

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

@@ -27,6 +27,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.common.base.Function;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.PreviewApi;
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
@@ -51,7 +52,6 @@
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.ByteBufferInputStream;
 import com.google.firebase.firestore.util.Executors;
-import com.google.firebase.firestore.util.Function;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firebase.firestore.util.Logger.Level;
 import com.google.firebase.firestore.util.Preconditions;

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

@@ -18,9 +18,9 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.core.util.Consumer;
 import com.google.android.gms.tasks.Task;
+import com.google.common.base.Function;
 import com.google.firebase.firestore.core.FirestoreClient;
 import com.google.firebase.firestore.util.AsyncQueue;
-import com.google.firebase.firestore.util.Function;
 import java.util.concurrent.Executor;
 
 /**

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

@@ -16,8 +16,8 @@
 
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import com.google.common.base.Function;
 import com.google.firebase.firestore.model.Document;
-import com.google.firebase.firestore.util.Function;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

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

@@ -22,6 +22,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.common.base.Function;
 import com.google.firebase.firestore.AggregateField;
 import com.google.firebase.firestore.EventListener;
 import com.google.firebase.firestore.FirebaseFirestoreException;
@@ -47,7 +48,6 @@
 import com.google.firebase.firestore.remote.RemoteSerializer;
 import com.google.firebase.firestore.remote.RemoteStore;
 import com.google.firebase.firestore.util.AsyncQueue;
-import com.google.firebase.firestore.util.Function;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firestore.v1.Value;
 import java.io.InputStream;

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

@@ -21,6 +21,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.common.base.Function;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.AggregateField;
@@ -52,7 +53,6 @@
 import com.google.firebase.firestore.remote.RemoteStore;
 import com.google.firebase.firestore.remote.TargetChange;
 import com.google.firebase.firestore.util.AsyncQueue;
-import com.google.firebase.firestore.util.Function;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firebase.firestore.util.Util;
 import com.google.firestore.v1.Value;

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

@@ -17,14 +17,14 @@
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.common.base.Function;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.TransactionOptions;
 import com.google.firebase.firestore.remote.Datastore;
 import com.google.firebase.firestore.remote.RemoteStore;
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
 import com.google.firebase.firestore.util.ExponentialBackoff;
-import com.google.firebase.firestore.util.Function;
 
 /** TransactionRunner encapsulates the logic needed to run and retry transactions with backoff. */
 public class TransactionRunner<TResult> {

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

@@ -30,13 +30,13 @@
 import android.database.sqlite.SQLiteTransactionListener;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.common.base.Function;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.util.Consumer;
 import com.google.firebase.firestore.util.FileUtil;
-import com.google.firebase.firestore.util.Function;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firebase.firestore.util.Supplier;
 import java.io.File;

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

@@ -22,6 +22,7 @@
 
 import android.database.Cursor;
 import androidx.annotation.VisibleForTesting;
+import com.google.common.base.Function;
 import com.google.firebase.Timestamp;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.firestore.core.Query;
@@ -33,7 +34,6 @@
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.util.BackgroundQueue;
 import com.google.firebase.firestore.util.Executors;
-import com.google.firebase.firestore.util.Function;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
 import java.util.ArrayList;