Add boxed primitive types to the JNI library

PiperOrigin-RevId: 334472082

Author: wilhuff

firestore/src/android/firestore_android.cc

@@ -40,13 +40,17 @@
 #include "firestore/src/android/write_batch_android.h"
 #include "firestore/src/include/firebase/firestore.h"
 #include "firestore/src/jni/array_list.h"
+#include "firestore/src/jni/boolean.h"
 #include "firestore/src/jni/collection.h"
+#include "firestore/src/jni/double.h"
 #include "firestore/src/jni/env.h"
 #include "firestore/src/jni/hash_map.h"
+#include "firestore/src/jni/integer.h"
 #include "firestore/src/jni/iterator.h"
 #include "firestore/src/jni/jni.h"
 #include "firestore/src/jni/list.h"
 #include "firestore/src/jni/loader.h"
+#include "firestore/src/jni/long.h"
 #include "firestore/src/jni/map.h"
 #include "firestore/src/jni/set.h"
 
@@ -180,11 +184,14 @@ bool FirestoreInternal::Initialize(App* app) {
     }
 
     jni::ArrayList::Initialize(loader);
+    jni::Boolean::Initialize(loader);
     jni::Collection::Initialize(loader);
-    FieldPathConverter::Initialize(loader);
+    jni::Double::Initialize(loader);
+    jni::Integer::Initialize(loader);
     jni::Iterator::Initialize(loader);
     jni::HashMap::Initialize(loader);
     jni::List::Initialize(loader);
+    jni::Long::Initialize(loader);
     jni::Map::Initialize(loader);
 
     InitializeFirestore(loader);

firestore/src/jni/boolean.cc

@@ -0,0 +1,37 @@
+#include "firestore/src/jni/boolean.h"
+
+#include "app/src/util_android.h"
+#include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+namespace {
+
+constexpr char kClassName[] = "java/lang/Boolean";
+Constructor<Boolean> kConstructor("(Z)V");
+Method<bool> kBooleanValue("booleanValue", "()Z");
+jclass g_clazz = nullptr;
+
+}  // namespace
+
+void Boolean::Initialize(Loader& loader) {
+  g_clazz = util::boolean_class::GetClass();
+  loader.LoadFromExistingClass(kClassName, g_clazz, kConstructor,
+                               kBooleanValue);
+}
+
+Class Boolean::GetClass() { return Class(g_clazz); }
+
+Local<Boolean> Boolean::Create(Env& env, bool value) {
+  return env.New(kConstructor, value);
+}
+
+bool Boolean::BooleanValue(Env& env) const {
+  return env.Call(*this, kBooleanValue);
+}
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase

firestore/src/jni/boolean.h

@@ -0,0 +1,29 @@
+#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_BOOLEAN_H_
+#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_BOOLEAN_H_
+
+#include "firestore/src/jni/jni_fwd.h"
+#include "firestore/src/jni/object.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+
+/** A C++ proxy for a Java `Boolean`. */
+class Boolean : public Object {
+ public:
+  using Object::Object;
+
+  static void Initialize(Loader& loader);
+
+  static Class GetClass();
+
+  static Local<Boolean> Create(Env& env, bool value);
+
+  bool BooleanValue(Env& env) const;
+};
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase
+
+#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_BOOLEAN_H_

firestore/src/jni/double.cc

@@ -0,0 +1,36 @@
+#include "firestore/src/jni/double.h"
+
+#include "app/src/util_android.h"
+#include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+namespace {
+
+constexpr char kClassName[] = "java/lang/Double";
+Constructor<Double> kConstructor("(D)V");
+Method<double> kDoubleValue("doubleValue", "()D");
+jclass g_clazz = nullptr;
+
+}  // namespace
+
+void Double::Initialize(Loader& loader) {
+  g_clazz = util::double_class::GetClass();
+  loader.LoadFromExistingClass(kClassName, g_clazz, kConstructor, kDoubleValue);
+}
+
+Class Double::GetClass() { return Class(g_clazz); }
+
+Local<Double> Double::Create(Env& env, double value) {
+  return env.New(kConstructor, value);
+}
+
+double Double::DoubleValue(Env& env) const {
+  return env.Call(*this, kDoubleValue);
+}
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase

firestore/src/jni/double.h

@@ -0,0 +1,29 @@
+#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DOUBLE_H_
+#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DOUBLE_H_
+
+#include "firestore/src/jni/jni_fwd.h"
+#include "firestore/src/jni/object.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+
+/** A C++ proxy for a Java `Double`. */
+class Double : public Object {
+ public:
+  using Object::Object;
+
+  static void Initialize(Loader& loader);
+
+  static Class GetClass();
+
+  static Local<Double> Create(Env& env, double value);
+
+  double DoubleValue(Env& env) const;
+};
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase
+
+#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DOUBLE_H_

firestore/src/jni/integer.cc

@@ -0,0 +1,34 @@
+#include "firestore/src/jni/integer.h"
+
+#include "app/src/util_android.h"
+#include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+namespace {
+
+constexpr char kClassName[] = "java/lang/Integer";
+Constructor<Integer> kConstructor("(I)V");
+Method<int32_t> kIntValue("intValue", "()I");
+jclass g_clazz = nullptr;
+
+}  // namespace
+
+void Integer::Initialize(Loader& loader) {
+  g_clazz = util::integer_class::GetClass();
+  loader.LoadFromExistingClass(kClassName, g_clazz, kConstructor, kIntValue);
+}
+
+Class Integer::GetClass() { return Class(g_clazz); }
+
+Local<Integer> Integer::Create(Env& env, int32_t value) {
+  return env.New(kConstructor, value);
+}
+
+int32_t Integer::IntValue(Env& env) const { return env.Call(*this, kIntValue); }
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase

firestore/src/jni/integer.h

@@ -0,0 +1,29 @@
+#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_INTEGER_H_
+#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_INTEGER_H_
+
+#include "firestore/src/jni/jni_fwd.h"
+#include "firestore/src/jni/object.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+
+/** A C++ proxy for a Java `Integer`. */
+class Integer : public Object {
+ public:
+  using Object::Object;
+
+  static void Initialize(Loader& loader);
+
+  static Class GetClass();
+
+  static Local<Integer> Create(Env& env, int32_t value);
+
+  int32_t IntValue(Env& env) const;
+};
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase
+
+#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_INTEGER_H_

firestore/src/jni/jni_fwd.h

@@ -46,7 +46,13 @@ class StaticField;
 template <typename T>
 class StaticMethod;
 
-// Collections
+// Other elements of java.lang
+class Boolean;
+class Double;
+class Integer;
+class Long;
+
+// Collections from java.util
 class ArrayList;
 class Collection;
 class Iterator;

firestore/src/jni/long.cc

@@ -0,0 +1,34 @@
+#include "firestore/src/jni/long.h"
+
+#include "app/src/util_android.h"
+#include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+namespace {
+
+constexpr char kClassName[] = "java/lang/Long";
+Constructor<Long> kConstructor("(J)V");
+Method<int64_t> kLongValue("longValue", "()J");
+jclass g_clazz = nullptr;
+
+}  // namespace
+
+void Long::Initialize(Loader& loader) {
+  g_clazz = util::long_class::GetClass();
+  loader.LoadFromExistingClass(kClassName, g_clazz, kConstructor, kLongValue);
+}
+
+Class Long::GetClass() { return Class(g_clazz); }
+
+Local<Long> Long::Create(Env& env, int64_t value) {
+  return env.New(kConstructor, value);
+}
+
+int64_t Long::LongValue(Env& env) const { return env.Call(*this, kLongValue); }
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase

firestore/src/jni/long.h

@@ -0,0 +1,29 @@
+#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LONG_H_
+#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LONG_H_
+
+#include "firestore/src/jni/jni_fwd.h"
+#include "firestore/src/jni/object.h"
+
+namespace firebase {
+namespace firestore {
+namespace jni {
+
+/** A C++ proxy for a Java `Long`. */
+class Long : public Object {
+ public:
+  using Object::Object;
+
+  static void Initialize(Loader& loader);
+
+  static Class GetClass();
+
+  static Local<Long> Create(Env& env, int64_t value);
+
+  int64_t LongValue(Env& env) const;
+};
+
+}  // namespace jni
+}  // namespace firestore
+}  // namespace firebase
+
+#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LONG_H_