Convert Query to the new JNI framework

PiperOrigin-RevId: 333157347

Author: wilhuff

firestore/src/android/collection_reference_android.cc

@@ -88,7 +88,7 @@ Future<DocumentReference> CollectionReferenceInternal::Add(
   Local<Object> task = env.Call(obj_, kAdd, map_value.java_object());
 
   auto promise = promises_.MakePromise<DocumentReference>();
-  promise.RegisterForTask(CollectionReferenceFn::kAdd, task.get());
+  promise.RegisterForTask(AsyncFn::kAdd, task.get());
   return promise.GetFuture();
 }
 

firestore/src/android/collection_reference_android.h

@@ -10,20 +10,20 @@
 namespace firebase {
 namespace firestore {
 
-// To make things simple, CollectionReferenceInternal uses the Future management
-// from its base class, QueryInternal. Each API of CollectionReference that
-// returns a Future needs to define an enum value to QueryFn. For example, a
-// Future-returning method Foo() relies on the enum value QueryFn::kFoo. The
-// enum values are used to identify and manage Future in the Firestore Future
-// manager.
-using CollectionReferenceFn = QueryFn;
-
 // This is the Android implementation of CollectionReference.
 class CollectionReferenceInternal : public QueryInternal {
  public:
   using ApiType = CollectionReference;
   using QueryInternal::QueryInternal;
 
+  // To make things simple, CollectionReferenceInternal uses the Future
+  // management from its base class, QueryInternal. Each API of
+  // CollectionReference that returns a Future needs to define an enum value in
+  // QueryFn. For example, a Future-returning method Foo() relies on the enum
+  // value AsyncFn::kFoo. The enum values are used to identify and manage Future
+  // in the Firestore Future manager.
+  using AsyncFn = QueryInternal::AsyncFn;
+
   static void Initialize(jni::Loader& loader);
 
   const std::string& id() const;

firestore/src/android/event_listener_android.cc

@@ -136,6 +136,13 @@ jobject EventListenerInternal::EventListenerToJavaEventListener(
   return result;
 }
 
+Local<Object> EventListenerInternal::Create(
+    Env& env, FirestoreInternal* firestore,
+    EventListener<QuerySnapshot>* listener) {
+  return Local<Object>(env.get(), EventListenerToJavaEventListener(
+                                      env.get(), firestore, listener));
+}
+
 /* static */
 jobject EventListenerInternal::EventListenerToJavaEventListener(
     JNIEnv* env, FirestoreInternal* firestore,

firestore/src/android/event_listener_android.h

@@ -33,6 +33,10 @@ class EventListenerInternal {
       JNIEnv* env, FirestoreInternal* firestore,
       EventListener<DocumentSnapshot>* listener);
 
+  static jni::Local<jni::Object> Create(jni::Env& env,
+                                        FirestoreInternal* firestore,
+                                        EventListener<QuerySnapshot>* listener);
+
   static jobject EventListenerToJavaEventListener(
       JNIEnv* env, FirestoreInternal* firestore,
       EventListener<QuerySnapshot>* listener);

firestore/src/android/field_value_android.h

@@ -84,6 +84,10 @@ class FieldValueInternal : public Wrapper {
 
 bool operator==(const FieldValueInternal& lhs, const FieldValueInternal& rhs);
 
+inline jobject ToJni(const FieldValueInternal* value) {
+  return value->java_object();
+}
+
 inline jobject ToJni(const FieldValueInternal& value) {
   return value.java_object();
 }

firestore/src/android/firestore_android.cc

@@ -167,7 +167,6 @@ bool FirestoreInternal::Initialize(App* app) {
           FieldValueInternal::Initialize(app) &&
           FirebaseFirestoreExceptionInternal::Initialize(app) &&
           ListenerRegistrationInternal::Initialize(app) &&
-          QueryInternal::Initialize(app) &&
           TransactionInternal::Initialize(app) && Wrapper::Initialize(app) &&
           // Initialize those embedded Firestore internal classes.
           InitializeEmbeddedClasses(app))) {
@@ -197,6 +196,7 @@ bool FirestoreInternal::Initialize(App* app) {
     FieldPathConverter::Initialize(loader);
     GeoPointInternal::Initialize(loader);
     MetadataChangesInternal::Initialize(loader);
+    QueryInternal::Initialize(loader);
     QuerySnapshotInternal::Initialize(loader);
     ServerTimestampBehaviorInternal::Initialize(loader);
     SetOptionsInternal::Initialize(loader);