Convert QuerySnapshot to the new JNI framework

PiperOrigin-RevId: 330111277

Author: wilhuff

firestore/src/android/firestore_android.cc

@@ -169,7 +169,6 @@ bool FirestoreInternal::Initialize(App* app) {
           GeoPointInternal::Initialize(app) &&
           ListenerRegistrationInternal::Initialize(app) &&
           QueryInternal::Initialize(app) &&
-          QuerySnapshotInternal::Initialize(app) &&
           TransactionInternal::Initialize(app) && Wrapper::Initialize(app) &&
           // Initialize those embedded Firestore internal classes.
           InitializeEmbeddedClasses(app))) {
@@ -198,6 +197,7 @@ bool FirestoreInternal::Initialize(App* app) {
     DocumentSnapshotInternal::Initialize(loader);
     FieldPathConverter::Initialize(loader);
     MetadataChangesInternal::Initialize(loader);
+    QuerySnapshotInternal::Initialize(loader);
     ServerTimestampBehaviorInternal::Initialize(loader);
     SetOptionsInternal::Initialize(loader);
     SettingsInternal::Initialize(loader);
@@ -257,7 +257,6 @@ void FirestoreInternal::ReleaseClasses(App* app) {
   GeoPointInternal::Terminate(app);
   ListenerRegistrationInternal::Terminate(app);
   QueryInternal::Terminate(app);
-  QuerySnapshotInternal::Terminate(app);
   TransactionInternal::Terminate(app);
   Wrapper::Terminate(app);
 }
@@ -589,6 +588,11 @@ ListenerRegistration FirestoreInternal::NewListenerRegistration(
       this, listener, passing_listener_ownership, registration.get()));
 }
 
+Query FirestoreInternal::NewQuery(jni::Env& env, const jni::Object& query) {
+  if (!env.ok() || !query) return {};
+  return Query(new QueryInternal(this, query.get()));
+}
+
 /* static */
 void Firestore::set_log_level(LogLevel log_level) {
   // "Verbose" and "debug" map to logging enabled.

firestore/src/android/firestore_android.h

@@ -131,6 +131,7 @@ class FirestoreInternal {
   ListenerRegistration NewListenerRegistration(
       jni::Env& env, EventListener<DocumentSnapshot>* listener,
       bool passing_listener_ownership, const jni::Object& registration);
+  Query NewQuery(jni::Env& env, const jni::Object& query);
 
   // The constructor explicit Foo(FooInternal*) is protected in public API.
   // But we want it to be public-usable in internal implementation code

firestore/src/android/query_snapshot_android.cc

@@ -3,14 +3,13 @@
 #include <jni.h>
 
 #include "app/src/assert.h"
-#include "app/src/util_android.h"
 #include "firestore/src/android/document_change_android.h"
 #include "firestore/src/android/document_snapshot_android.h"
 #include "firestore/src/android/metadata_changes_android.h"
 #include "firestore/src/android/query_android.h"
 #include "firestore/src/android/snapshot_metadata_android.h"
-#include "firestore/src/android/util_android.h"
 #include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
 
 namespace firebase {
 namespace firestore {
@@ -19,86 +18,56 @@ namespace {
 using jni::Env;
 using jni::List;
 using jni::Local;
+using jni::Method;
 using jni::Object;
 
-}  // namespace
+constexpr char kClassName[] =
+    PROGUARD_KEEP_CLASS "com/google/firebase/firestore/QuerySnapshot";
+Method<Object> kGetQuery("getQuery", "()Lcom/google/firebase/firestore/Query;");
+Method<SnapshotMetadataInternal> kGetMetadata(
+    "getMetadata", "()Lcom/google/firebase/firestore/SnapshotMetadata;");
+Method<List> kGetDocumentChanges(
+    "getDocumentChanges",
+    "(Lcom/google/firebase/firestore/MetadataChanges;)Ljava/util/List;");
+Method<List> kGetDocuments("getDocuments", "()Ljava/util/List;");
+Method<size_t> kSize("size", "()I");
 
-// clang-format off
-#define QUERY_SNAPSHOT_METHODS(X)                                          \
-  X(Query, "getQuery", "()Lcom/google/firebase/firestore/Query;"),         \
-  X(Metadata, "getMetadata",                                               \
-    "()Lcom/google/firebase/firestore/SnapshotMetadata;"),                 \
-  X(DocumentChanges, "getDocumentChanges",                                 \
-    "(Lcom/google/firebase/firestore/MetadataChanges;)Ljava/util/List;"),  \
-  X(Documents, "getDocuments", "()Ljava/util/List;"),                      \
-  X(Size, "size", "()I")
-// clang-format on
+}  // namespace
 
-METHOD_LOOKUP_DECLARATION(query_snapshot, QUERY_SNAPSHOT_METHODS)
-METHOD_LOOKUP_DEFINITION(query_snapshot,
-                         PROGUARD_KEEP_CLASS
-                         "com/google/firebase/firestore/QuerySnapshot",
-                         QUERY_SNAPSHOT_METHODS)
+void QuerySnapshotInternal::Initialize(jni::Loader& loader) {
+  loader.LoadClass(kClassName, kGetQuery, kGetMetadata, kGetDocumentChanges,
+                   kGetDocuments, kSize);
+}
 
 Query QuerySnapshotInternal::query() const {
-  JNIEnv* env = firestore_->app()->GetJNIEnv();
-  jobject query = env->CallObjectMethod(
-      obj_, query_snapshot::GetMethodId(query_snapshot::kQuery));
-  QueryInternal* internal = new QueryInternal{firestore_, query};
-  env->DeleteLocalRef(query);
-
-  CheckAndClearJniExceptions(env);
-  return Query{internal};
+  Env env = GetEnv();
+  Local<Object> query = env.Call(obj_, kGetQuery);
+  return firestore_->NewQuery(env, query);
 }
 
 SnapshotMetadata QuerySnapshotInternal::metadata() const {
   Env env = GetEnv();
-  auto java_metadata = env.Call<SnapshotMetadataInternal>(
-      obj_, query_snapshot::GetMethodId(query_snapshot::kMetadata));
-  return java_metadata.ToPublic(env);
+  return env.Call(obj_, kGetMetadata).ToPublic(env);
 }
 
 std::vector<DocumentChange> QuerySnapshotInternal::DocumentChanges(
     MetadataChanges metadata_changes) const {
   Env env = GetEnv();
   auto java_metadata = MetadataChangesInternal::Create(env, metadata_changes);
 
-  Local<List> change_list = env.Call<List>(
-      obj_, query_snapshot::GetMethodId(query_snapshot::kDocumentChanges),
-      java_metadata);
+  Local<List> change_list = env.Call(obj_, kGetDocumentChanges, java_metadata);
   return MakeVector<DocumentChange>(env, change_list);
 }
 
 std::vector<DocumentSnapshot> QuerySnapshotInternal::documents() const {
   Env env = GetEnv();
-  Local<List> document_list = env.Call<List>(
-      obj_, query_snapshot::GetMethodId(query_snapshot::kDocuments));
+  Local<List> document_list = env.Call(obj_, kGetDocuments);
   return MakeVector<DocumentSnapshot>(env, document_list);
 }
 
 std::size_t QuerySnapshotInternal::size() const {
-  JNIEnv* env = firestore_->app()->GetJNIEnv();
-  jint result = env->CallIntMethod(
-      obj_, query_snapshot::GetMethodId(query_snapshot::kSize));
-
-  CheckAndClearJniExceptions(env);
-  return static_cast<std::size_t>(result);
-}
-
-/* static */
-bool QuerySnapshotInternal::Initialize(App* app) {
-  JNIEnv* env = app->GetJNIEnv();
-  jobject activity = app->activity();
-  bool result = query_snapshot::CacheMethodIds(env, activity);
-  util::CheckAndClearJniExceptions(env);
-  return result;
-}
-
-/* static */
-void QuerySnapshotInternal::Terminate(App* app) {
-  JNIEnv* env = app->GetJNIEnv();
-  query_snapshot::ReleaseClass(env);
-  util::CheckAndClearJniExceptions(env);
+  Env env = GetEnv();
+  return env.Call(obj_, kSize);
 }
 
 }  // namespace firestore

firestore/src/android/query_snapshot_android.h

@@ -10,6 +10,7 @@
 #include "firestore/src/include/firebase/firestore/query.h"
 #include "firestore/src/include/firebase/firestore/query_snapshot.h"
 #include "firestore/src/include/firebase/firestore/snapshot_metadata.h"
+#include "firestore/src/jni/jni_fwd.h"
 
 namespace firebase {
 namespace firestore {
@@ -19,6 +20,8 @@ class QuerySnapshotInternal : public Wrapper {
   using ApiType = QuerySnapshot;
   using Wrapper::Wrapper;
 
+  static void Initialize(jni::Loader& loader);
+
   /**
    * @brief The query from which you get this QuerySnapshot.
    */
@@ -59,12 +62,6 @@ class QuerySnapshotInternal : public Wrapper {
    * @return The number of documents in the QuerySnapshot.
    */
   std::size_t size() const;
-
- private:
-  friend class FirestoreInternal;
-
-  static bool Initialize(App* app);
-  static void Terminate(App* app);
 };
 
 }  // namespace firestore