1 files changed, 3 insertions, 23 deletions
diff --git a/platform/android/src/gson/json_primitive.hpp b/platform/android/src/gson/json_primitive.hpp
index c418e0ebe8..36f138d902 100644
--- a/platform/android/src/gson/json_primitive.hpp
+++ b/platform/android/src/gson/json_primitive.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <mapbox/geometry.hpp>
-#include <mbgl/util/noncopyable.hpp>
+#include "json_element.hpp"
 
 #include <jni/jni.hpp>
 
@@ -9,30 +8,11 @@ namespace mbgl {
 namespace android {
 namespace gson {
 
-class JsonPrimitive : private mbgl::util::noncopyable {
+class JsonPrimitive {
 public:
-    using value = mapbox::util::variant<mapbox::geometry::null_value_t, bool, uint64_t, int64_t, double, std::string>;
-
+    using SuperTag = JsonElement;
     static constexpr auto Name() { return "com/google/gson/JsonPrimitive"; };
 
-    static jni::Object<JsonPrimitive> New(jni::JNIEnv&, const value&);
-
-    static value convert(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static bool isBoolean(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static bool isString(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static bool isNumber(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static bool getAsBoolean(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static std::string getAsString(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static double getAsDouble(JNIEnv&, jni::Object<JsonPrimitive>);
-
-    static jni::Class<JsonPrimitive> javaClass;
-
     static void registerNative(jni::JNIEnv&);
 };