Add Equals to the JNI Object proxy.

Also add GetClass to some JNI proxies.

Remove Wrapper::EqualsJavaObject

PiperOrigin-RevId: 334501941

Author: wilhuff

firestore/src/android/field_value_android.cc

@@ -613,17 +613,8 @@ void FieldValueInternal::Terminate(App* app) {
 }
 
 bool operator==(const FieldValueInternal& lhs, const FieldValueInternal& rhs) {
-  // Most likely only happens when comparing one with itself or both are Null.
-  if (lhs.obj_ == rhs.obj_) {
-    return true;
-  }
-
-  // If only one of them is Null, then they cannot equal.
-  if (lhs.obj_ == nullptr || rhs.obj_ == nullptr) {
-    return false;
-  }
-
-  return lhs.EqualsJavaObject(rhs);
+  Env env = FirestoreInternal::GetEnv();
+  return Object::Equals(env, lhs.ToJava(), rhs.ToJava());
 }
 
 jobject FieldValueInternal::TryGetJobject(const FieldValue& value) {

firestore/src/android/firestore_android.cc

@@ -177,12 +177,13 @@ bool FirestoreInternal::Initialize(App* app) {
                            ::firebase_firestore::firestore_resources_size);
     loader.CacheEmbeddedFiles();
 
-    if (!(  // Call Initialize on each Firestore internal class.
-            FieldValueInternal::Initialize(app) && Wrapper::Initialize(app))) {
+    if (!FieldValueInternal::Initialize(app)) {
       ReleaseClasses(app);
       return false;
     }
 
+    jni::Object::Initialize(loader);
+
     jni::ArrayList::Initialize(loader);
     jni::Boolean::Initialize(loader);
     jni::Collection::Initialize(loader);
@@ -239,7 +240,6 @@ void FirestoreInternal::ReleaseClasses(App* app) {
 
   // Call Terminate on each Firestore internal class.
   FieldValueInternal::Terminate(app);
-  Wrapper::Terminate(app);
 }
 
 /* static */

firestore/src/android/query_android.cc

@@ -309,7 +309,8 @@ Local<Array<Object>> QueryInternal::ConvertFieldValues(
 }
 
 bool operator==(const QueryInternal& lhs, const QueryInternal& rhs) {
-  return lhs.EqualsJavaObject(rhs);
+  Env env = FirestoreInternal::GetEnv();
+  return Object::Equals(env, lhs.ToJava(), rhs.ToJava());
 }
 
 }  // namespace firestore

firestore/src/android/wrapper.cc

@@ -23,13 +23,6 @@ using jni::String;
 
 }  // namespace
 
-// clang-format off
-#define OBJECT_METHOD(X) X(Equals, "equals", "(Ljava/lang/Object;)Z")
-// clang-format on
-
-METHOD_LOOKUP_DECLARATION(object, OBJECT_METHOD)
-METHOD_LOOKUP_DEFINITION(object, "java/lang/Object", OBJECT_METHOD)
-
 Wrapper::Wrapper(FirestoreInternal* firestore, jobject obj)
     : Wrapper(firestore, obj, AllowNullObject::Yes) {
   FIREBASE_ASSERT(obj != nullptr);
@@ -93,18 +86,6 @@ Wrapper::~Wrapper() {
   }
 }
 
-bool Wrapper::EqualsJavaObject(const Wrapper& other) const {
-  if (obj_ == other.obj_) {
-    return true;
-  }
-
-  JNIEnv* env = firestore_->app()->GetJNIEnv();
-  jboolean result = env->CallBooleanMethod(
-      obj_, object::GetMethodId(object::kEquals), other.obj_);
-  CheckAndClearJniExceptions(env);
-  return static_cast<bool>(result);
-}
-
 Local<HashMap> Wrapper::MakeJavaMap(Env& env, const MapFieldValue& data) const {
   Local<HashMap> result = HashMap::Create(env);
   for (const auto& kv : data) {
@@ -140,20 +121,5 @@ Wrapper::UpdateFieldPathArgs Wrapper::MakeUpdateFieldPathArgs(
   return UpdateFieldPathArgs{Move(first_field), first_value, Move(varargs)};
 }
 
-/* static */
-bool Wrapper::Initialize(App* app) {
-  JNIEnv* env = app->GetJNIEnv();
-  jobject activity = app->activity();
-  bool result = object::CacheMethodIds(env, activity);
-  util::CheckAndClearJniExceptions(env);
-  return result;
-}
-
-/* static */
-void Wrapper::Terminate(App* app) {
-  JNIEnv* env = app->GetJNIEnv();
-  object::ReleaseClass(env);
-  util::CheckAndClearJniExceptions(env);
-}
 }  // namespace firestore
 }  // namespace firebase

firestore/src/android/wrapper.h

@@ -56,9 +56,6 @@ class Wrapper {
   jobject java_object() const { return obj_; }
   jni::Object ToJava() const { return jni::Object(obj_); }
 
-  // Tests the equality of the wrapped Java Object.
-  bool EqualsJavaObject(const Wrapper& other) const;
-
  protected:
   enum class AllowNullObject { Yes };
   // Default constructor. Subclass is expected to set the obj_ a meaningful
@@ -129,9 +126,6 @@ class Wrapper {
 
  private:
   friend class FirestoreInternal;
-
-  static bool Initialize(App* app);
-  static void Terminate(App* app);
 };
 
 }  // namespace firestore

firestore/src/jni/class.cc

@@ -24,6 +24,10 @@ std::string Class::GetName(Env& env) const {
   return env.Call(*this, kGetName).ToString(env);
 }
 
+std::string Class::GetClassName(Env& env, const Object& object) {
+  return util::JObjectClassName(env.get(), object.get());
+}
+
 bool Class::IsArray(Env& env) const { return env.Call(*this, kIsArray); }
 
 }  // namespace jni

firestore/src/jni/class.h

@@ -30,6 +30,8 @@ class Class : public Object {
    */
   std::string GetName(Env& env) const;
 
+  static std::string GetClassName(Env& env, const Object& object);
+
   bool IsArray(Env& env) const;
 
  private:

firestore/src/jni/list.cc

@@ -11,14 +11,17 @@ namespace {
 
 Method<Object> kGet("get", "(I)Ljava/lang/Object;");
 Method<Object> kSet("set", "(ILjava/lang/Object;)Ljava/lang/Object;");
+jclass g_clazz = nullptr;
 
 }  // namespace
 
 void List::Initialize(Loader& loader) {
-  loader.LoadFromExistingClass("java/util/List", util::list::GetClass(), kGet,
-                               kSet);
+  g_clazz = util::list::GetClass();
+  loader.LoadFromExistingClass("java/util/List", g_clazz, kGet, kSet);
 }
 
+Class List::GetClass() { return Class(g_clazz); }
+
 Local<Object> List::Get(Env& env, size_t i) const {
   return env.Call(*this, kGet, i);
 }

firestore/src/jni/list.h

@@ -15,6 +15,8 @@ class List : public Collection {
 
   static void Initialize(Loader& loader);
 
+  static Class GetClass();
+
   Local<Object> Get(Env& env, size_t i) const;
   Local<Object> Set(Env& env, size_t i, const Object& object);
 };

firestore/src/jni/map.cc

@@ -15,14 +15,18 @@ Method<Object> kGet("get", "(Ljava/lang/Object;)Ljava/lang/Object;");
 Method<Object> kPut("put",
                     "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
 Method<Set> kKeySet("keySet", "()Ljava/util/Set;");
+jclass g_clazz = nullptr;
 
 }  // namespace
 
 void Map::Initialize(Loader& loader) {
-  loader.LoadFromExistingClass("java/util/Map", util::map::GetClass(), kSize,
-                               kGet, kPut, kKeySet);
+  g_clazz = util::map::GetClass();
+  loader.LoadFromExistingClass("java/util/Map", g_clazz, kSize, kGet, kPut,
+                               kKeySet);
 }
 
+Class Map::GetClass() { return Class(g_clazz); }
+
 size_t Map::Size(Env& env) const { return env.Call(*this, kSize); }
 
 Local<Object> Map::Get(Env& env, const Object& key) {

firestore/src/jni/map.h

@@ -17,6 +17,8 @@ class Map : public Object {
 
   static void Initialize(Loader& loader);
 
+  static Class GetClass();
+
   size_t Size(Env& env) const;
   Local<Object> Get(Env& env, const Object& key);
   Local<Object> Put(Env& env, const Object& key, const Object& value);

firestore/src/jni/object.cc

@@ -3,10 +3,22 @@
 #include "app/src/util_android.h"
 #include "firestore/src/jni/class.h"
 #include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
 
 namespace firebase {
 namespace firestore {
 namespace jni {
+namespace {
+
+Method<bool> kEquals("equals", "(Ljava/lang/Object;)Z");
+jclass g_clazz = nullptr;
+
+}  // namespace
+
+void Object::Initialize(Loader& loader) {
+  g_clazz = util::object::GetClass();
+  loader.LoadFromExistingClass("java/lang/Object", g_clazz, kEquals);
+}
 
 Class Object::GetClass() { return Class(util::object::GetClass()); }
 
@@ -16,6 +28,20 @@ std::string Object::ToString(JNIEnv* env) const {
 
 std::string Object::ToString(Env& env) const { return ToString(env.get()); }
 
+bool Object::Equals(Env& env, const Object& other) const {
+  return env.Call(*this, kEquals, other);
+}
+
+bool Object::Equals(Env& env, const Object& lhs, const Object& rhs) {
+  // Most likely only happens when comparing one with itself or both are null.
+  if (lhs.get() == rhs.get()) return true;
+
+  // If only one of them is nullptr, then they cannot equal.
+  if (!lhs || !rhs) return false;
+
+  return lhs.Equals(env, rhs);
+}
+
 }  // namespace jni
 }  // namespace firestore
 }  // namespace firebase

firestore/src/jni/object.h

@@ -11,6 +11,7 @@ namespace jni {
 
 class Class;
 class Env;
+class Loader;
 
 /**
  * A wrapper for a JNI `jobject` that adds additional behavior.
@@ -29,6 +30,8 @@ class Object {
 
   virtual jobject get() const { return object_; }
 
+  static void Initialize(Loader& loader);
+
   static Class GetClass();
 
   /**
@@ -38,6 +41,9 @@ class Object {
   std::string ToString(JNIEnv* env) const;
   std::string ToString(Env& env) const;
 
+  bool Equals(Env& env, const Object& other) const;
+  static bool Equals(Env& env, const Object& lhs, const Object& rhs);
+
  protected:
   jobject object_ = nullptr;
 };